285 files changed, 35639 insertions, 27986 deletions

diff --git a/ChangeLog b/ChangeLog
index c1e23c9..d8c3348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,378 @@
+2006-01-16	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.266) (+9 -0)
+
+	Add list of bugs fixed.
+
+2006-01-16	<rlk@sourceforge.net>
+
+	Files:	doc/gutenprint-options (1.2) (+731 -729)
+
+	Update description of Laminate Pattern.
+
+2006-01-16	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-1 (1.6) (+4 -3)
+
+	Update this script also.
+
+2006-01-15	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern (1.20) (+2 -1)
+		src/testpattern/testpattern.c (1.43) (+11 -5)
+
+	Return error status correctly, and do not error out unnecessarily
+
+2006-01-14	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.265) (+32 -23)
+		doc/Makefile.am (1.43) (+7 -2)
+		doc/gutenprint-options (1.1) ( )
+
+	Add gutenprint-options documentation
+
+2006-01-13	<rleigh@sourceforge.net>
+
+	Files:	configure.ac (1.133) (+21 -2)
+		src/main/util.h (1.33) (+2 -8)
+
+	Add a feature test for GCC __attribute__ syntax.
+
+2006-01-10	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.264) (+8 -4)
+		src/foomatic/foomatic-printermap (1.109) (+2 -0)
+		src/main/print-escp2-data.c (1.190) (+41 -9)
+		src/main/print-escp2.h (1.100) (+3 -2)
+		src/main/printers.xml (1.140) (+9 -1)
+
+	Change quality settings for some newer printers that need higher
+	resolutions (1.5 pl and PictureMate).
+
+	Add higher resolutions for RX700 (up to 5760x2880).
+
+	Add Japanese equivalents of RX700 and R2400.
+
+2006-01-09	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.347) (+1 -14)
+
+	Remove unused MultiChannelLimit option
+
+2006-01-09	<rleigh@sourceforge.net>
+
+	Files:	m4extra/gettext.m4 (1.2) (+510 -276)
+		m4extra/gtk.m4 (1.1) ( )
+		m4extra/lcmessage.m4 (1.2) (+28 -17)
+		m4extra/libtool.m4 (1.2) (+6333 -338)
+		m4extra/progtest.m4 (1.2) (+71 -26)
+
+	Add GTK-1.2 m4 macro to m4extra.
+	Update existing m4extra m4 macros.
+
+2006-01-08	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.91) (+4 -4)
+
+	More tweaks for R800.
+
+2006-01-08	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.263) (+9 -2)
+
+	Improve R800 tuning.
+
+2006-01-08	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.90) (+46 -46)
+
+	Improve tuning of R800.
+
+2006-01-08	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.89) (+4 -4)
+
+	More improvement for the R300.
+
+2006-01-07	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.262) (+10 -9)
+		README (1.156) (+64 -66)
+
+	Increase the prominence of CUPS
+
+2006-01-07	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.261) (+4 -5)
+
+	Upgrade status of Epson PictureMate
+
+2006-01-07	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.189) (+2 -2)
+
+	Went a bit too far last time...
+
+2006-01-07	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.88) (+3 -3)
+		src/main/print-escp2-data.c (1.188) (+2 -2)
+
+	Improve the PictureMate some more
+
+2006-01-07	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-inks.c (1.46) (+7 -7)
+		src/main/escp2-papers.c (1.87) (+3 -3)
+		src/main/escp2-resolutions.c (1.31) (+7 -1)
+		src/main/print-escp2-data.c (1.187) (+5 -5)
+
+	Further improvements for PictureMate
+
+2006-01-07	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-generator.in (1.57) (+2 -0)
+
+	Add a few more suffixes used by Epson printers.
+
+2006-01-06	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.260) (+2 -1)
+		src/main/escp2-channels.c (1.60) (+2 -2)
+		src/main/escp2-driver.c (1.27) (+2 -2)
+		src/main/escp2-inks.c (1.45) (+4 -4)
+		src/main/escp2-resolutions.c (1.30) (+26 -1)
+		src/main/print-escp2-data.c (1.186) (+5 -5)
+		src/main/print-escp2.h (1.99) (+3 -2)
+
+	Initial cut at PictureMate tuning.
+
+2006-01-06	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.259) (+3 -3)
+
+	Update RX700 status
+
+2006-01-05	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.185) (+4 -4)
+
+	Fixes for RX700 from Chuck McCrobie.
+
+2006-01-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.258) (+53 -46)
+
+	Minor tweaks
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.257) (+6 -4)
+		src/foomatic/foomatic-printermap (1.108) (+1 -0)
+		src/main/printers.xml (1.139) (+8 -1)
+
+	Add Epson Stylus CX4500
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.113) (+2 -51)
+
+	Don't create UI constraints for color options in black and white mode,
+	since there aren't actually any conflicts.
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.79) (+4 -1)
+
+	Warn if printer is not known
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.107) (+1 -0)
+		src/main/printers.xml (1.138) (+5 -1)
+
+	Add Epson PictureMake Deluxe
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.78) (+154 -57)
+
+	Respond more reasonably to unknown printer:
+
+	1) If identify is requested, always print the printer name whether we
+	   know about it or not.
+
+	2) If ink level is requested and the ink cartridge ID is 0x40, use an
+	   auxiliary set of color names.
+
+	3) If extended ink level is requested, first get ink color names and
+	   then attempt to use those to read ink names.
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.256) (+12 -6)
+		src/foomatic/foomatic-printermap (1.106) (+2 -0)
+		src/main/escp2-channels.c (1.59) (+163 -1)
+		src/main/escp2-inks.c (1.44) (+22 -1)
+		src/main/escp2-papers.c (1.86) (+21 -1)
+		src/main/print-escp2-data.c (1.184) (+37 -2)
+		src/main/print-escp2.h (1.98) (+6 -2)
+		src/main/printers.xml (1.137) (+9 -1)
+
+	Preliminary support for the Epson E-100/PictureMate.
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.112) (+2 -116)
+
+	Don't generate UI constraints for the quality and image type
+	parameters, since they don't disable anything any more.
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.255) (+12 -3)
+
+	Update printer list
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.105) (+8 -8)
+
+	Add a few more printers.
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	src/main/papers.xml (1.19) (+2 -2)
+
+	4x6 photo paper has become very common.
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.254) (+11 -5)
+		src/foomatic/foomatic-printermap (1.104) (+5 -0)
+		src/main/print-escp2-data.c (1.183) (+52 -3)
+		src/main/printers.xml (1.136) (+49 -8)
+
+	Add a few more Epson multi-function printers.
+
+	Fix up escputil -e output on multi-function printers.
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	README (1.155) (+1 -1)
+
+	Minor wording change
+
+2005-12-31	<rlk@sourceforge.net>
+
+	Files:	src/escputil/d4lib.c (1.5) (+8 -8)
+		src/escputil/escputil.c (1.77) (+2 -2)
+
+	Improve performance
+
+2005-12-30	<rlk@sourceforge.net>
+
+	Files:	src/gutenprintui/panel.c (1.7) (+12 -10)
+		src/gutenprintui2/panel.c (1.9) (+12 -10)
+
+	Minor fix to option group separators
+
+2005-12-30	<rlk@sourceforge.net>
+
+	Files:	src/main/print-color.c (1.134) (+2 -2)
+
+	Move GCR curve to advanced 4, since other GCR parameters are in advanced4.
+
+2005-12-30	<rlk@sourceforge.net>
+
+	Files:	README (1.154) (+3 -3)
+
+	Minor wording change.
+
+2005-12-30	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.253) (+8 -7)
+		README (1.153) (+9 -9)
+
+	Bump version
+
+2005-12-30	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.252) (+6 -4)
+		src/gutenprintui/panel.c (1.6) (+14 -5)
+		src/gutenprintui2/panel.c (1.8) (+14 -4)
+
+	Eliminate spurious horizontal lines drawn through some options in
+	the GIMP plugin in some cases.
+
+2005-12-30	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.85) (+4 -4)
+
+	Improve tuning of premium papers.
+
+2005-12-29	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-inks.c (1.43) (+3 -3)
+
+	Correct names of a few sets of drop sizes.
+
+2005-12-29	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.251) (+29 -14)
+
+	Note latest round of updates.
+
+2005-12-29	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.111) (+4 -7)
+		src/main/dither-main.c (1.51) (+32 -51)
+		src/main/escp2-driver.c (1.26) (+3 -1)
+		src/main/print-color.c (1.133) (+4 -11)
+		src/main/print-escp2-data.c (1.182) (+15 -15)
+		src/main/print-escp2.c (1.346) (+151 -112)
+
+	Allow specification of all options along with Quality and Image Type.
+	This improves the user interface by making it more apparent that the
+	other options are available.
+
+2005-12-29	<rleigh@sourceforge.net>
+
+	Files:	configure.ac (1.132) (+5 -2)
+		doc/README.maintaining (1.21) (+2 -2)
+		src/gutenprintui/gutenprintui.pc.in (1.2) (+2 -1)
+		src/gutenprintui2/gutenprintui2.pc.in (1.2) (+2 -1)
+		src/main/gutenprint.pc.in (1.2) (+2 -1)
+
+	Use the pkg-config Libs.private feature to separate out inter-library
+	dependencies which are only required when linking statically.  This
+	simplifies the dependencies for dynamic linking and package management.
+	For packages depending upon the .pc files, pkg-config 0.18 or above is
+	required to use this feature (but not for building gutenprint).
+
+2005-12-24	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.110) (+16 -6)
+		src/cups/rastertoprinter.c (1.97) (+12 -5)
+
+	1389787 CUPS driver does not set Quality correctly
+
+2005-12-24	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.22) (+4 -5)
+
+	1389785 cups-genppdupdate sets PPD file owners incorrectly
+
+2005-11-22	<rleigh@sourceforge.net>
+
+	Files:	doc/.cvsignore (1.11) (+3 -0)
+
+	Ignore generated gutenprintui2 files.
+
 2005-11-22	<rleigh@sourceforge.net>
 
 	Files:	doc/developer/Makefile.am (1.18) (+2 -2)
+		doc/users_guide/Makefile.am (1.44) (+3 -3)
 		src/cups/Makefile.am (1.83) (+3 -3)
 		src/foomatic/Makefile.am (1.47) (+2 -2)
 
@@ -27,6 +399,7 @@
 		doc/Makefile.am (1.42) (+1 -5)
 		doc/developer/Makefile.am (1.17) (+1 -5)
 		doc/developer/using.xml (1.3) (+1 -4)
+		doc/users_guide/Makefile.am (1.43) (+1 -5)
 		include/Makefile.am (1.7) (+1 -5)
 		include/gutenprint/Makefile.am (1.2) (+1 -5)
 		include/gutenprintui/Makefile.am (1.3) (+1 -5)
@@ -940,6 +1313,14 @@
 
 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)
 
@@ -1779,6 +2160,7 @@
 
 	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)
 
@@ -2044,6 +2426,16 @@
 		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) ( )
@@ -3171,6 +3563,12 @@
 
 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)
 
@@ -3874,6 +4272,7 @@
 	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)
@@ -4163,6 +4562,14 @@
 
 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
@@ -4331,6 +4738,12 @@
 	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)
@@ -4624,6 +5037,7 @@
 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)
@@ -4708,6 +5122,8 @@
 
 	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)
@@ -10226,6 +10642,7 @@
 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
 
@@ -10418,6 +10835,7 @@
 		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)
@@ -11853,13 +12271,6 @@
 
 	Update .cvsignore
 
-2002-10-09	<rleigh@sourceforge.net>
-
-	Files:	debian/.cvsignore (1.7) (+2 -2)
-
-	Add ijsgimpprint package
-	Miscellaneous other small updates
-
 2002-10-07	<rlk@sourceforge.net>
 
 	Files:	po/ja.po (1.1) ( )
@@ -12529,6 +12940,13 @@
 
 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
@@ -13056,6 +13474,28 @@
 
 	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)
@@ -13077,6 +13517,47 @@
 
 	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)
@@ -13103,6 +13584,18 @@
 
 	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) ( )
@@ -13288,6 +13781,7 @@
 	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)
@@ -13615,6 +14109,12 @@
 
 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)
@@ -13884,13 +14384,6 @@
 
 2001-12-01	<rleigh@sourceforge.net>
 
-	Files:	debian/.cvsignore (1.6) (+0 -1)
-
-	Update package descriptions for 4.3
-	Packages depends on libgimpprint-locales >= the Source-Version
-
-2001-12-01	<rleigh@sourceforge.net>
-
 	Files:	doc/developer/.cvsignore (1.2) (+1 -1)
 		doc/developer/Makefile.am (1.2) (+2 -2)
 
@@ -13931,6 +14424,14 @@
 
 	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)
@@ -13946,6 +14447,12 @@
 
 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)
@@ -14087,6 +14594,12 @@
 
 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)
@@ -14131,6 +14644,7 @@
 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):
 
@@ -14324,6 +14838,20 @@
 
 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
@@ -14359,6 +14887,7 @@
 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.
 
@@ -14407,6 +14936,8 @@
 		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)
@@ -14580,6 +15111,12 @@
 
 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
@@ -14690,6 +15227,7 @@
 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
@@ -14816,6 +15354,13 @@
 
 	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)
@@ -14826,9 +15371,32 @@
 	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:	src/ghost/.cvsignore (1.6) (+1 -0)
+	Files:	doc/users_guide/.cvsignore (1.3) (+1 -0)
+		src/ghost/.cvsignore (1.6) (+1 -0)
 
 	Updates
 
@@ -14853,6 +15421,25 @@
 	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)
@@ -14889,12 +15476,24 @@
 
 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
@@ -14926,12 +15525,34 @@
 
 2001-10-06	<andystewart@sourceforge.net>
 
-	Files:	scripts/autogen.sh (1.9) (+27 -11)
+	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)
 
 	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
@@ -14962,6 +15583,33 @@
 
 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.
@@ -14974,8 +15622,15 @@
 
 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
@@ -14990,6 +15645,27 @@
 	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)
@@ -15000,12 +15676,14 @@
 
 	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
@@ -15020,10 +15698,39 @@
 
 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)
@@ -17057,7 +17764,6 @@
 2001-06-04	<rleigh@sourceforge.net>
 
 	Files:	.cvsignore (1.14) (+1 -0)
-		debian/.cvsignore (1.5) (+1 -0)
 		doc/.cvsignore (1.2) (+3 -0)
 		src/main/.cvsignore (1.4) (+1 -0)
 
@@ -18022,15 +18728,6 @@
 	it this way.
 	Fixed minor bugs in bjc-unprint.
 
-2001-03-20	<sharkey@sourceforge.net>
-
-	Files:	debian/.cvsignore (1.4) (+9 -0)
-
-	Resurrect .cvsignore, and add a few more entries, too.
-
-	This should have been resurrected a log time ago, but I missed it because
-	is began with a ".".
-
 2001-03-19	<gandy@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.26) (+2 -2)
@@ -18468,12 +19165,6 @@
 
 	Fix the page dimensions of some older Epson printers.
 
-2001-02-22	<sharkey@sourceforge.net>
-
-	Files:	debian/.cvsignore (1.3) (+0 -0)
-
-	Really, I mean it now, remove this file from the main trunk!
-
 2001-02-21	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.90) (+15 -2)
@@ -18753,14 +19444,6 @@
 
 	Speed up escputil by using poll if available.
 
-2001-02-12	<rleigh@sourceforge.net>
-
-	Files:	debian/.cvsignore (1.2) (+0 -2)
-
-	Add debian/rules, debian/control and update debian/.cvsignore
-	Add error message to cups library checks in configure.in.in
-	Remove redundant cups/.cvsignore
-
 2001-02-12	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2.c (1.17) (+29 -28)
@@ -22331,12 +23014,6 @@
 
 	More constant tuning
 
-2000-07-24	<cpbs@sourceforge.net>
-
-	Files:	debian/.cvsignore (1.1) ( )
-
-	*** empty log message ***
-
 2000-07-23	<rlk@sourceforge.net>
 
 	Files:	print-dither.c (1.75) (+4 -4)
diff --git a/Makefile.in b/Makefile.in
index 2ce07a2..55d7dbd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -295,10 +295,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/NEWS b/NEWS
index 7605798..0ab7062 100644
--- a/NEWS
+++ b/NEWS
@@ -19,34 +19,39 @@ important) piece of the package.  Furthermore, the name Gutenprint
 recognizes Johannes Gutenberg, the inventor of the movable type
 printing press.  Finally, the word "guten" means "good" in German.
 
-Gutenprint 5.0.0-rc1 is the first release candidate of Gutenprint 5.0.
-It is based on the Gimp-Print 4.3 series that has been in development
-for over three years, and includes many improvements over the very
-popular 4.2 series.  This release is believed to be quite stable, but
-further testing is required before final release.  We believe this
-release to be stable enough for day to day use, and encourage people
-to test it and report their results.
+Gutenprint 5.0.0-rc2 is the second release candidate of Gutenprint
+5.0, and incorporates extensive feedback from the first release
+candidate.  It is based on the Gimp-Print 4.3 series that has been in
+development for over three years, and includes many improvements over
+the very popular 4.2 series.  This release is believed to be quite
+stable, but further testing is required before final release.  We
+believe this release to be stable enough for day to day use, and
+encourage people to test it and report their results.
 
 Gutenprint currently contains over 200 drivers supporting in excess of
-600 printer models.
-
-The Print plug-in for the GIMP requires the GIMP 1.2.3 or above on the
-1.2 line (1.2.5 is recommended), or the GIMP 2.0 or above.  You may
-need to install packages named "gimp-devel", "gtk-devel", and
-"glib-devel" (or similar equivalents) on many systems.  This plug-in
-will work with any printing system, and offers a comprehensive user
-interface to control all aspects of the printing process.
-
-The CUPS driver requires CUPS 1.1.15 or higher.  You may need to
-install a package named "cups-devel" or similar on many systems.
-Please the rest of the release notes, in particular the Exceptions and
-Workarounds, for full details on installation, as there is an
-important caveat.  CUPS is the printing system used on Macintosh OS X
-10.2 and above, and many other systems use it.  The combination of
-CUPS and Gutenprint provides a flexible, general purpose printing
-system capable of producing the highest quality output with any of the
-printers supported by this package.  We strongly recommend using CUPS
-with Gutenprint as a general-purpose printing solution.
+700 printer models.
+
+The CUPS driver requires CUPS 1.1.15 or higher.  If you wish to build
+this from source, you may need to install a package named "cups-devel"
+or something similar.  Please the rest of the release notes, in
+particular the Exceptions and Workarounds, for full details on
+installation, as there is important information to be aware of.  CUPS
+is the printing system used on Macintosh OS X 10.2 and above, and many
+other systems use it.  The combination of CUPS and Gutenprint provides
+a flexible, general purpose printing system capable of producing the
+highest quality output with any of the printers supported by this
+package.  We strongly recommend using CUPS with Gutenprint as a
+general-purpose printing solution.
+
+The Print plug-in for the GIMP requires either the GIMP 2.0 or above,
+or 1.2.3 or above on the 1.2 line (1.2.5 is recommended), or the GIMP
+2.0 or above.  You may need to install packages named "gimp-devel",
+"gtk-devel", and "glib-devel" (or similar equivalents) on many
+systems.  For GIMP 2.0, you may need to install "gimp2-devel",
+"gtk2-devel", "glib2-devel", and possibly other packages as well.
+This plug-in will work with any printing system, and offers a
+comprehensive user interface to control all aspects of the printing
+process.
 
 The Ghostscript driver requires GNU Ghostscript 6.53 or higher, ESP
 Ghostscript 7.05 or higher, or AFPL Ghostscript 7.04 or higher.  It
@@ -59,7 +64,7 @@ Users of Macintosh OS X 10.2 (Jaguar), 10.3 (Panther), and 10.4
 (Tiger) can use this package, as the printing system is based on CUPS.
 For ease of installation, a pre-built package with installer is
 normally supplied a few days after the release of the source package.
-We highly recommend that OS X users use the pre-built package rather
+We strongly recommend that OS X users use the pre-built package rather
 than attempt to build it themselves.
 
 NOTE: This package will not work with any version of OS X 10.0 and
@@ -71,7 +76,7 @@ OS X 10.0 and 10.1 use a different system that would require a
 separate driver, and we do not plan to write that driver.
 
 The README file included with this package provides full instructions
-on building and installing Gutenprint.
+for building and installing Gutenprint.
 
 These release notes contain the following sections:
 
@@ -97,66 +102,105 @@ These release notes contain the following sections:
      size.  Previously it corrupted the output if the width of the
      image was not a multiple of 4 pixels.
 
-  4) The GIMP plugin now loads the printrc file correctly in all
+  4) The driver package now permits specifying all options regardless
+     of the setting of the Image Type and Quality options (previously
+     it disabled a lot of settings if Quality and/or Image Type were
+     not set to Manual Control).  The behavior is now that Quality and
+     Image Type provide defaults that may be overridden by the user.
+     For example, if the resolution is provided explicitly, it will
+     override the resolution implied by the Quality setting.
+
+     Related to this, the CUPS driver now handles Quality properly.
+
+  5) A description of all options supported by Gutenprint has been
+     added, in doc/gutenprint-options.
+
+  6) cups-genppdupdate now preserves the ownership and permissions of
+     the PPD files being updated, rather than forcibly setting the
+     owner to root and the permissions to root read/write and everyone
+     else read-only access.
+
+  7) 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
+  8) 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.
+  9) The GIMP plugin is now considerably more responsive; many
+     unnecessary screen redraws have been removed.  In addition, a
+     display glitch wherein horizontal lines were sometimes drawn
+     through certain widgets has been fixed.
 
-  7) The Epson printer utility escputil now reports ink information
+  10) 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).
+  11) Preliminary support for the Epson Stylus C68, C87, C88, CX3700,
+     CX3800, CX3805, CX3810, CX4100, CX4200, CX4500, CX4700, CX4800,
+     CX5700, CX5800, CX7700, CX7800, D68, D88, DX3800, DX3850, DX4200,
+     DX4250, DX4800, PX-A650, 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 -- it does not support scanning or fax).
 
-  9) Preliminary support for the Epson Stylus Photo R2400.  This
-     printer has been partially tuned, but there will likely be
+  12) Preliminary support for the Epson Stylus Photo R2400/PX-5500.
+     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.
+  13) Support for the Epson PictureMate/E-100.
 
-  11) Initial support for Canon S200, SELPHY CP-510 and SELPHY CP-710;
+  14) Preliminary support for the Epson Stylus Photo RX700/PM-A900.
+     This printer has been partially tuned, but there will likely be
+     further changes to this driver.
+
+  15) 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
+  16) 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
+  17) 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.
+     Affected printers are presently 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
+  18) The Epson Stylus Photo R800 and R1800 have been retuned to give
+     improved detail in the shadows, reduced ink usage, more accurate
+     grayscale, and more accurate colors.
+
+     Any profiles generated against these printers will have to be
+     re-created.
+
+  19) 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
+  20) Quadtone printing now works correctly regardless of whether
      color or grayscale mode is selected.
 
+The following bugs have been fixed in Gutenprint 5.0.0-rc2:
+
+1389788 Poor discoverability of advanced options
+1389787 CUPS driver does not set Quality correctly
+1389785 cups-genppdupdate sets PPD file owners incorrectly
+1388615 escputil with Epson CX3700
+1304710 Postscript driver corrupts output if width not multiple of 4
+1251978 PPD for Stylus Color 600
+
 
 ================================================================
 
@@ -179,16 +223,16 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
   3) Simplified bundles of settings are now offered for users who do
      not need to customize the settings.  The Print Quality and Image
      Type controls offer a variety of settings optimized for common
-     printing tasks.  Both controls offer Manual Control settings for
-     users who wish greater control over the output.
+     printing tasks; these settings may be overridden by explicit user
+     choice.
 
   4) Many of the color settings have changed effect.  We recommend
-     starting with no color correction and making appropriate changes
+     starting with no color adjustments and making appropriate changes
      only as required.  Specific changes that you should be aware of
      include:
 
      * The default operation of the contrast setting has changed to be
-       more in accord with standard practice.  In 4.2, reducing the
+       more in accord with other packages.  In 4.2, reducing the
        contrast resulted in changing the black and white setting.  In
        5.0, reducing the contrast does not change the black and white
        settings.  As a result, it is possible to use the contrast
@@ -196,7 +240,7 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
        contrast.
 
        The previous behavior is available by turning on the "Linear
-       Contrast Adjustment".
+       Contrast Adjustment" setting.
 
      * The brightness control now behaves more in accord with standard
        practice, adjusting the image's overall brightness without
@@ -212,7 +256,8 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
        correction.  They are applied after the color correction to
        scale the individual channels.  The per-channel gray balance
        settings adjust gray balance without affecting per-channel
-       density settings, permitting better color saturation without
+       density settings (i. e. the adjust the amount of ink used to
+       generate gray), permitting increased color saturation without
        compromising gray balance.
 
   5) The Uncorrected color correction mode is recommended for users
@@ -240,8 +285,9 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
 
 * New Functionality:
 
-  1) This release offers a new curve data type, permitting very
-     precise adjustments of output.
+  1) This release offers a new "curve" data type, permitting very
+     precise adjustments of output.  Currently the curves are only
+     accessible in the GIMP plugin.
 
   2) This release offers many new output controls:
 
@@ -289,7 +335,8 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      vs. bidirectional) is now a separate control.  In addition to
      contributing to the simplification of the Epson printer
      resolutions, this permits the choice of unidirectional
-     vs. bidirectional at all resolutions.
+     vs. bidirectional at all resolutions if desired.  By default, the
+     driver picks the most appropriate choice for the situation.
 
   8) The Epson driver now allows printing directly to CD's on printers
      that support this functionality.  In addition, a choice of center
@@ -307,13 +354,7 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      different choices of inks (such as the Epson Stylus Photo 2200,
      which offers a choice of Matte Black and Photo Black inks).
 
-  11) The Epson driver permits adjusting the dot size if required to
-     increase the amount of ink printed.  For example, if 1440x720 DPI
-     is selected, but the density requested is very high, the printer
-     will switch to using drop sizes appropriate for 720 DPI.  This
-     option is not normally required and is disabled by default.
-
-  12) Where practical, all controls offer a default setting for
+  11) Where practical, all controls offer a default setting for
      simplicity of operation.  This default value is intended to offer
      the optimal choice given the printer and its other settings.  For
      example, if "Automatic" is selected for print head direction, the
@@ -327,32 +368,32 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      based on the paper type loaded by the user.  Similarly, there is
      no default for the input slot or ink set.
 
-  13) Support for a variety of input types, in both 8 and 16 bit
+  12) Support for a variety of input types, in both 8 and 16 bit
      resolution, has been added.  Gutenprint can now handle input in
      grayscale, whitescale (inverted grayscale), RGB, CMY, CMYK, and
      KCMY in 8 and 16 bit resolutions for all output types.
 
-  14) A new Threshold color correction mode has been added that
+  13) A new Threshold color correction mode has been added that
      produces either all-on or all-off of each color.  This is similar
      to the Monochrome mode in 4.2, except that it works for color as
      well as black.
 
-  15) A new Desaturated color correction mode has been added that
+  14) A new Desaturated color correction mode has been added that
      produces gray (desaturated) output using color inks.
 
-  16) A new Density color correction mode has been added that corrects
+  15) A new Density color correction mode has been added that corrects
      only for density.  This will normally produce excessively dark
      output.  However, applications that wish to use their own
      linearization curves may wish to use this interface to prevent
      Gutenprint from performing its own linearization.
 
-  17) A new Raw color correction mode has been added that performs no
+  16) A new Raw color correction mode has been added that performs no
      correction whatsoever on the input.  This mode may be used by
      applications that wish to perform their own ink limiting and
      linearization, and use Gutenprint to perform dithering
      (screening) and output generation only.
 
-  18) A new Predithered color correction mode has been added that
+  17) A new Predithered color correction mode has been added that
      combines the effects of Raw and Threshold.  This mode may be used
      by applications that wish to perform their own dithering and use
      Gutenprint to generate printer-specific output only.  The input
@@ -360,7 +401,7 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
      printers, it should be 0 or 1; for printers with three drop
      sizes, it should be 0, 1, 2, or 3).
 
-  19) A new Correct Hue Only color correction mode has been added that
+  18) A new Correct Hue Only color correction mode has been added that
      performs partial color correction (adjusts hue, but not
      darkness).
 
@@ -375,10 +416,11 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
        older printers, it simply returns the standard ink
        information.
 
-     * Ink level detection now works on all known supported printers.
-       Previously it did not work on some newer printers.  However, it
-       is somewhat slower on these printers than it is on older
-       printers that support the faster ink detection method.
+     * Ink level detection now works on all known supported printers,
+       and may work on other non-supported printers.  Previously it
+       did not work on some newer printers.  However, it is somewhat
+       slower on these printers than it is on older printers that
+       support the faster ink detection method.
 
      * Ink level detection now prints the correct ink color names for
        the printer model.
@@ -390,13 +432,19 @@ Overall changes between Gimp-Print 4.2 and Gutenprint 5.0:
        If you supply a printer queue (with the -P option) rather than
        a raw device (with the -r option), you will still need to
        provide the -u flag, as the utility cannot detect the actual
-       printer connected to a queue.  However, bidirectional commands
-       (ink level, identify, printer status, and alignment) do not
-       require the -u flag any more.
+       printer connected to a queue.  However, commands that must be
+       run bidirectionally (ink level, identify, and printer status)
+       do not require the -u flag any more.
 
      * escputil now successfully detects ink level, printer model, and
        status even if the printer is out of ink.
 
+  20) The Epson driver permits adjusting the dot size if required to
+     increase the amount of ink printed.  For example, if 1440x720 DPI
+     is selected, but the density requested is very high, the printer
+     will switch to using drop sizes appropriate for 720 DPI.  This
+     option is not normally required and is disabled by default.
+
 
 * Changes to the Print plugin for the GIMP:
 
@@ -1253,8 +1301,6 @@ Known Build/Installation Issues
 	 the ijsgutenprint in the next release.  This is to prevent
 	 accidentally using incorrect data, which could cause
 	 incorrect function to take place.
-
-
 ================================================================
 
 
@@ -1276,6 +1322,11 @@ good output at the highest resolution offered (2880x720, 2880x1440, or
 2880x2880 DPI), since in general these printers will not use multiple
 drop sizes at such high resolutions.
 
+Note that Gutenprint supports only the printer in multi-function
+devices -- this package does not support scanning, fax, copying, or
+any other function.  For scanning, please visit the SANE project
+(http://www.sane-project.org).
+
 Please see the printer-specific notes section following the list of
 printers for any instructions specific to your printer.
 
@@ -1432,8 +1483,11 @@ EPSON Stylus CX-3600
 EPSON Stylus CX-3650
 EPSON Stylus CX-3700
 EPSON Stylus CX-3800
+EPSON Stylus CX-3805
 EPSON Stylus CX-3810
+EPSON Stylus CX-4100
 EPSON Stylus CX-4200
+EPSON Stylus CX-4500
 EPSON Stylus CX-4600
 EPSON Stylus CX-4700
 EPSON Stylus CX-4800
@@ -1441,6 +1495,7 @@ EPSON Stylus CX-5100
 EPSON Stylus CX-5200
 EPSON Stylus CX-5300
 EPSON Stylus CX-5400
+EPSON Stylus CX-5700
 EPSON Stylus CX-5800
 EPSON Stylus CX-6300
 EPSON Stylus CX-6400
@@ -1455,7 +1510,9 @@ EPSON Stylus D88
 EPSON Stylus DX-3800
 EPSON Stylus DX-3850
 EPSON Stylus DX-4200
+EPSON Stylus DX-4250
 EPSON Stylus DX-4800
+EPSON PictureMate
 EPSON CL-700
 EPSON CL-750
 EPSON CL-760    (Experimental)
@@ -1498,6 +1555,7 @@ EPSON PM-5000C
 EPSON PM-7000C
 EPSON PM-9000C
 EPSON PM-10000
+EPSON PM-A900
 EPSON PM-D750
 EPSON PM-D770
 EPSON PM-D1000
@@ -1505,10 +1563,12 @@ EPSON PM-G700
 EPSON PM-G720
 EPSON PM-G800   (Experimental)
 EPSON PM-G820   (Experimental)
+EPSON PX-A650
 EPSON PX-G900
 EPSON PX-G5000
 EPSON PX-V500
 EPSON PX-V600
+EPSON PX-5500
 EPSON PX-7000
 EPSON PX-9000
 Fujifilm Printpix CX-400
@@ -1659,6 +1719,7 @@ Canon LBP-1000                 pcl-6           HP LaserJet 6 series
 Canon LBP-1260                 pcl-6           HP LaserJet 6 series
 Canon LBP-1760                 pcl-6           HP LaserJet 6 series
 Canon S100                     bjc-4300        Canon BJC 4300
+Canon S200                     bjc-s200        Canon S200
 Canon S300                     bjc-s800        Canon S800
 Canon S400                     bjc-s400        Canon S400
 Canon S450                     bjc-s450        Canon S450
@@ -1794,7 +1855,9 @@ 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 RX430       escp2-rx430     EPSON Stylus Photo RX430
 Epson Stylus Photo RX500       escp2-rx500     EPSON Stylus Photo RX500
+Epson Stylus Photo RX510       escp2-rx510     EPSON Stylus Photo RX510
 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
@@ -1813,6 +1876,7 @@ Epson Stylus Pro 9600          escp2-9600      EPSON Stylus Pro 9600
 Epson Stylus Pro 10000         escp2-10000     EPSON Stylus Pro 10000
 Epson Stylus Scan 2000         escp2-scan2000  EPSON Stylus Scan 2000
 Epson Stylus Scan 2500         escp2-scan2500  EPSON Stylus Scan 2500
+Epson Stylus CX1500            escp2-cx1500    EPSON Stylus CX-1500
 Epson Stylus CX3100            escp2-cx3100    EPSON Stylus CX-3100
 Epson Stylus CX3200            escp2-cx3200    EPSON Stylus CX-3200
 Epson Stylus CX3500            escp2-cx3500    EPSON Stylus CX-3500
@@ -1820,7 +1884,11 @@ 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 CX3805            escp2-cx3805    EPSON Stylus CX-3805
+Epson Stylus CX3810            escp2-cx3810    EPSON Stylus CX-3810
+Epson Stylus CX4100            escp2-cx4100    EPSON Stylus CX-4100
 Epson Stylus CX4200            escp2-cx4200    EPSON Stylus CX-4200
+Epson Stylus CX4500            escp2-cx4500    EPSON Stylus CX-4500
 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
@@ -1828,9 +1896,11 @@ 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 CX5700            escp2-cx5700    EPSON Stylus CX-5700
 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 CX6500            escp2-cx6500    EPSON Stylus CX-6500
 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
@@ -1841,12 +1911,16 @@ 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 DX4250            escp2-dx4250    EPSON Stylus DX-4250
 Epson Stylus DX4800            escp2-dx4800    EPSON Stylus DX-4800
+Epson PictureMate              escp2-picmate   EPSON PictureMate
+Epson PictureMate Deluxe       escp2-picmated  EPSON PictureMate Deluxe
 Epson CL-700                   escp2-cl700     EPSON CL-700
 Epson CL-750                   escp2-cl750     EPSON CL-750
 Epson CL-760                   escp2-cl760     EPSON CL-760
 Epson EM-900C                  escp2-em900c    EPSON EM-900C
 Epson EM-930C                  escp2-em930c    EPSON EM-930C
+Epson E-100                    escp2-e100      EPSON E-100
 Epson MC-2000                  escp2-mc2000    EPSON MC-2000
 Epson MC-5000                  escp2-mc5000    EPSON MC-5000
 Epson MC-7000                  escp2-mc7000    EPSON MC-7000
@@ -1884,6 +1958,7 @@ Epson PM-5000C                 escp2-pm5000c   EPSON PM-5000C
 Epson PM-7000C                 escp2-pm7000c   EPSON PM-7000C
 Epson PM-9000C                 escp2-pm9000c   EPSON PM-9000C
 Epson PM-10000                 escp2-pm10000   EPSON PM-10000
+Epson PM-A900                  escp2-pma900    EPSON PM-A900
 Epson PM-D750                  escp2-pmd750    EPSON PM-D750
 Epson PM-D770                  escp2-pmd770    EPSON PM-D770
 Epson PM-D1000                 escp2-pmd1000   EPSON PM-D1000
@@ -1891,11 +1966,13 @@ Epson PM-G700                  escp2-pmg700    EPSON PM-G700
 Epson PM-G720                  escp2-pmg720    EPSON PM-G720
 Epson PM-G800                  escp2-pmg800    EPSON PM-G800
 Epson PM-G820                  escp2-pmg820    EPSON PM-G820
+Epson PX-A650                  escp2-pxa650    EPSON PX-A650
 Epson PX-G900                  escp2-pxg900    EPSON PX-G900
 Epson PX-G920                  escp2-pxg920    EPSON PX-G920
 Epson PX-G5000                 escp2-pxg5000   EPSON PX-G5000
 Epson PX-V500                  escp2-pxv500    EPSON PX-V500
 Epson PX-V600                  escp2-pxv600    EPSON PX-V600
+Epson PX-5500                  escp2-px5500    EPSON PX-5500
 Epson PX-7000                  escp2-px7000    EPSON PX-7000
 Epson PX-9000                  escp2-px9000    EPSON PX-9000
 Fujifilm Printpix CX-400       fujifilm-cx400  Fujifilm Printpix CX-400
@@ -2350,14 +2427,15 @@ Printer-Specific Notes:
 	 and offer benefit over lower resolutions.	 
 
 	 It is almost always better to have a printing resolution with
-	 a smaller aspect ratio.  Therefore a resolution of 2880x1440
-	 DPI is likely to yield superior results to a resolution of
-	 5760x720 DPI.  Therefore, in some cases we do not offer
-	 certain resolutions offered by the printer vendor (in the
-	 case of the Epson Stylus Photo R800, 5760x1440 DPI) because
-	 they are not likely to yield any benefit (either speed or
-	 quality) over another resolution that we offer (in this case,
-	 2880x2880 DPI).
+	 a smaller aspect ratio (i. e. the horizontal and vertical
+	 resolutions are similar).  For example, a resolution of
+	 2880x1440 DPI is likely to yield superior results to a
+	 resolution of 5760x720 DPI.  Therefore, in some cases we do
+	 not offer certain resolutions offered by the printer vendor
+	 (in the case of the Epson Stylus Photo R800, 5760x1440 DPI)
+	 because they are not likely to yield any benefit (either
+	 speed or quality) over another resolution that we offer (in
+	 this case, 2880x2880 DPI).
 
 	 Indeed, we have received reports that in some cases a lower
 	 resolution may actually offer improved quality over a higher
diff --git a/README b/README
index 79350e6..c52ff69 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 INTRODUCTION
 
-    This is Gutenprint version 5.0.0 release candidate 1, the first
+    This is Gutenprint version 5.0.0 release candidate 2, the second
     release candidate of Gutenprint 5.0.  Gutenprint, formerly named
     Gimp-Print, is a suite of printer drivers that may be used with
     most common UNIX print spooling systems, including CUPS, lpr,
@@ -45,19 +45,15 @@ BASIC INSTALLATION
 
     Gutenprint includes the following primary components:
 
-      - The core driver, libgutenprint.so
-      - A user's manual
-      - A Print plug-in for the GIMP
+      - The core driver package
       - A CUPS (Common UNIX Printing System) driver
-      - An IJS-based Ghostscript driver
+      - A Print plug-in for the GIMP
       - Support for the Foomatic spooler configuration system
-      - A utility to administer Epson printers, escputil
+      - A Ghostscript driver using the IJS plugin facility
+      - A utility to administer and maintain Epson printers
 
-    By default, Gutenprint builds the Print plugin for the GIMP, the
-    user's manual, and a utility to perform head cleaning, nozzle
-    alignment, and other tasks on EPSON Stylus inkjet printers, named
-    "escputil".  Directions for building other components are listed
-    below.
+    The core driver package is always built.  Directions for building
+    the other components are listed below.
 
     Please check our web site at http://gimp-print.sourceforge.net for
     details about what is and is not supported.
@@ -90,56 +86,6 @@ BASIC INSTALLATION
     need to use 'gmake'.
 
 
-THE GIMP
-
-    Gutenprint may be used as a plug-in for the GIMP, providing the
-    ability to print images.  If you wish to do so, you must use the
-    GIMP 1.2.3 or above on the 1.2 line, or any GIMP 2.x release (2.0,
-    2.1, 2.2, etc.)  Please read the release notes in addition to this
-    README, as there have been some changes in procedure since
-    Gimp-Print 4.2 if you are using certain versions of the GIMP.
-
-    To build and install the GIMP Print plug-in for the GIMP 1.2:
-
-    ./configure [--with-gimp]
-    make
-    make install
-
-    For the GIMP 2.0 or above, the option "--with-gimp2" rather than
-    "--with-gimp" should be used.
-
-    You may optionally specify --with-gimp or --with-gimp2 if you wish
-    to be explicit about building the GIMP Print plugin; --with-gimp
-    is implied if `configure' detects that the GIMP is installed, so
-    you do not actually need to specify it.
-
-    This installs the GIMP Print plugin in your system plug-in
-    directory.  If you wish to install it in your personal plugin
-    directory, you may use
-
-    ./configure --enable-user-install
-
-    If you have installed the GIMP as a precompiled package
-    (e. g. from an RPM), you will need to install the gimp-devel
-    (sometimes called gimp-developer, or something similar) package as
-    well as the gimp package.  The GIMP package as supplied in most
-    distributions only contains what's needed to run the GIMP, not the
-    additional files needed to build GIMP-based applications and
-    plugins such as the Print plugin.  On some systems, you will also
-    need to install gtk-devel and glib-devel packages as well.
-
-    If you have installed the GIMP from source on Linux: after running
-    make install, you must run ldconfig as root before attempting to
-    build this plugin.
-
-    The GIMP 1.2 will not be supported in Gutenprint 5.1 and beyond.
-    However, all Gutenprint 5.0 releases will support The GIMP 1.2.
-
-    The GIMP 2.x plugin may eventually be migrated to The GIMP project
-    for a future GIMP release.  It may be removed from the Gutenprint
-    distribution following Gutenprint 5.0.
-
-
 CUPS
 
     Gutenprint may be used as a driver under CUPS (Common UNIX
@@ -150,8 +96,9 @@ CUPS
     above; that release of CUPS fixes some important bugs.
 
     This package includes a CUPS driver that may be built, allowing
-    use of this software for general printing purposes.  To build and
-    install the CUPS driver, you must run:
+    use of this software for general printing purposes.  Gutenprint
+    will normally detect the presence of CUPS; if it doesn't on your
+    system, you must run:
 
     ./configure --with-cups
     make
@@ -199,11 +146,11 @@ CUPS
     a version of Gutenprint with PPD files not built for that precise
     version, the driver will fail with a diagnostic error message.
     For example, PPD files built for Gutenprint 5.0.0-beta4 will not
-    work with driver version 5.0.0-rc1.  You can identify printers
+    work with driver version 5.0.0-rc2.  You can identify printers
     using Gutenprint PPD files by the name of the PPD file, which will
     be something like:
 
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en)
 
     NOTE for Linux (at least) users: If you are using CUPS 1.1.11 or
     higher, and you have a USB-connected printer, you must have a
@@ -239,15 +186,15 @@ E [21/Nov/2001:17:59:07 +0500] add_printer: bad device-uri attribute 'usb:/dev/u
     apparent when you use a CUPS front end to select a PPD file and
     you see something like this:
 
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(en)
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(en)
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en)
 
     rather than this:
 
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(en)
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(sv)
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(fr)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(sv)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc2(fr)
 
     you may wish to turn off the translation of PPD files:
 
@@ -277,6 +224,56 @@ E [21/Nov/2001:17:59:07 +0500] add_printer: bad device-uri attribute 'usb:/dev/u
     and installing CUPS.
 
 
+THE GIMP
+
+    Gutenprint may be used as a plug-in for the GIMP, providing the
+    ability to print images.  If you wish to do so, you must use the
+    GIMP 1.2.3 or above on the 1.2 line, or any GIMP 2.x release (2.0,
+    2.1, 2.2, etc.)  Please read the release notes in addition to this
+    README, as there have been some changes in procedure since
+    Gimp-Print 4.2 if you are using certain versions of the GIMP.
+
+    To build and install the GIMP Print plug-in for the GIMP 1.2:
+
+    ./configure [--with-gimp]
+    make
+    make install
+
+    For the GIMP 2.0 or above, the option "--with-gimp2" rather than
+    "--with-gimp" should be used.
+
+    You may optionally specify --with-gimp or --with-gimp2 if you wish
+    to be explicit about building the GIMP Print plugin; --with-gimp
+    is implied if `configure' detects that the GIMP is installed, so
+    you do not actually need to specify it.
+
+    This installs the GIMP Print plugin in your system plug-in
+    directory.  If you wish to install it in your personal plugin
+    directory, you may use
+
+    ./configure --enable-user-install
+
+    If you have installed the GIMP as a precompiled package
+    (e. g. from an RPM), you will need to install the gimp-devel
+    (sometimes called gimp-developer, or something similar) package as
+    well as the gimp package.  The GIMP package as supplied in most
+    distributions only contains what's needed to run the GIMP, not the
+    additional files needed to build GIMP-based applications and
+    plugins such as the Print plugin.  On some systems, you will also
+    need to install gtk-devel and glib-devel packages as well.
+
+    If you have installed the GIMP from source on Linux: after running
+    make install, you must run ldconfig as root before attempting to
+    build this plugin.
+
+    The GIMP 1.2 will not be supported in Gutenprint 5.1 and beyond.
+    However, all Gutenprint 5.0 releases will support The GIMP 1.2.
+
+    The GIMP 2.x plugin may eventually be migrated to The GIMP project
+    for a future GIMP release.  It may be removed from the Gutenprint
+    distribution in Gutenprint 5.1.
+
+
 FOOMATIC
 
     Gutenprint includes support for the Foomatic meta-driver package.
@@ -294,9 +291,9 @@ FOOMATIC
     the release version of Gutenprint in its name.  Therefore, the
     Foomatic name for this driver is "gutenprint-ijs.5.0".
 
-    Foomatic data generation has been fixed as of Gutenprint
-    5.0.0-beta4, and is now an appropriate solution for queue
-    configuration.
+    Foomatic data generation works correctly as of Gutenprint
+    5.0.0-beta4 and later releases, and is now an appropriate solution
+    for queue configuration.
 
     To verify that you have an appropriate version of Foomatic, please
     run
@@ -392,12 +389,13 @@ GHOSTSCRIPT
     are very complex and are subject to change, and the older printer
     configuration tools (such as apsfilter and magicfilter) do not
     provide a convenient interface to the driver's capabilities.  We
-    no longer provide documentation on manual use of this driver.
+    no longer provide documentation on direct use of this driver
+    without the Foomatic front end.
 
     Gutenprint 5.0 no longer provides the monolithic "stp" driver
-    present in 4.2.  This driver, which was linked directly into
-    Ghostscript, was very difficult to maintain and required a complex
-    integration procedure.
+    present in Gimp-Print 4.2.  This driver, which was compiled and
+    linked directly into Ghostscript, was very difficult to maintain
+    and required a complex integration procedure.
 
 
 RECOMMENDED SETTINGS
diff --git a/aclocal.m4 b/aclocal.m4
index 111d141..a88e781 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -405,7 +405,7 @@ main ()
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -555,6 +555,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -574,10 +575,10 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@@ -625,6 +626,9 @@ AC_DEFUN([_LT_AC_SYS_COMPILER],
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
@@ -653,7 +657,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 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
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 ])# _LT_COMPILER_BOILERPLATE
@@ -666,7 +670,7 @@ $rm conftest*
 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
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
 ])# _LT_LINKER_BOILERPLATE
@@ -972,6 +976,22 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # 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
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -1014,9 +1034,9 @@ AC_CACHE_CHECK([$1], [$2],
    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 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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
      fi
    fi
@@ -1047,8 +1067,8 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
      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
+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
        fi
@@ -1123,6 +1143,12 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     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`
     ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
   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
@@ -1136,6 +1162,17 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
       esac
     fi
     ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    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
@@ -1167,7 +1204,7 @@ fi
 
 
 # _LT_AC_CHECK_DLFCN
-# --------------------
+# ------------------
 AC_DEFUN([_LT_AC_CHECK_DLFCN],
 [AC_CHECK_HEADERS(dlfcn.h)dnl
 ])# _LT_AC_CHECK_DLFCN
@@ -1175,7 +1212,7 @@ AC_DEFUN([_LT_AC_CHECK_DLFCN],
 
 # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
+# ---------------------------------------------------------------------
 AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "$cross_compiling" = yes; then :
@@ -1241,6 +1278,8 @@ int main ()
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }]
@@ -1251,7 +1290,7 @@ EOF
     case x$lt_status in
       x$lt_dlno_uscore) $1 ;;
       x$lt_dlneed_uscore) $2 ;;
-      x$lt_unknown|x*) $3 ;;
+      x$lt_dlunknown|x*) $3 ;;
     esac
   else :
     # compilation failed
@@ -1263,7 +1302,7 @@ rm -fr conftest*
 
 
 # AC_LIBTOOL_DLOPEN_SELF
-# -------------------
+# ----------------------
 AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "x$enable_dlopen" != xyes; then
@@ -1334,7 +1373,7 @@ else
     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -1347,7 +1386,7 @@ else
     ])
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
     	  lt_cv_dlopen_self_static, [dnl
 	  _LT_AC_TRY_DLOPEN_SELF(
@@ -1407,9 +1446,9 @@ 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
-     $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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
@@ -1794,10 +1833,15 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -1857,6 +1901,18 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  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'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -1990,6 +2046,7 @@ nto-qnx*)
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
@@ -2033,13 +2090,6 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -2065,7 +2115,7 @@ sunos4*)
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2098,6 +2148,29 @@ sysv4*MP*)
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2111,6 +2184,11 @@ uts4*)
 esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
 ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 
 
@@ -2135,6 +2213,9 @@ if test -f "$ltmain" && test -n "$tagnames"; then
       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
     fi
   fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
 
   # Extract list of available tagged configurations in $ofile.
   # Note that this assumes the entire list is on one line.
@@ -2263,7 +2344,7 @@ AC_ARG_ENABLE([shared],
 
 # AC_DISABLE_SHARED
 # -----------------
-#- set the default shared flag to --disable-shared
+# set the default shared flag to --disable-shared
 AC_DEFUN([AC_DISABLE_SHARED],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)
@@ -2571,7 +2652,7 @@ 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'
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -2671,6 +2752,11 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
+interix3*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $LD in
   *-32|*"-32 ") libmagic=32-bit;;
@@ -2716,15 +2802,11 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
@@ -2745,10 +2827,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
 
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -2768,36 +2853,43 @@ AC_DEFUN([AC_PROG_NM],
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
 	  break
 	  ;;
 	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
 NM="$lt_cv_path_NM"
@@ -2903,7 +2995,7 @@ _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])
@@ -2952,7 +3044,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
 
 
 # AC_LIBTOOL_RC
-# --------------
+# -------------
 # enable support for Windows resource files
 AC_DEFUN([AC_LIBTOOL_RC],
 [AC_REQUIRE([LT_AC_PROG_RC])
@@ -2989,37 +3081,6 @@ _LT_AC_SYS_COMPILER
 _LT_COMPILER_BOILERPLATE
 _LT_LINKER_BOILERPLATE
 
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
-    ;;
-  esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
-  else
-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
-
 AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
 AC_LIBTOOL_PROG_COMPILER_PIC($1)
 AC_LIBTOOL_PROG_CC_C_O($1)
@@ -3028,9 +3089,9 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1)
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
+AC_LIBTOOL_DLOPEN_SELF
 
-# Report which librarie types wil actually be built
+# Report which library types will actually be built
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
 
@@ -3089,6 +3150,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
 _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 _LT_AC_TAGVAR(hardcode_automatic, $1)=no
 _LT_AC_TAGVAR(module_cmds, $1)=
 _LT_AC_TAGVAR(module_expsym_cmds, $1)=
@@ -3116,7 +3178,7 @@ _LT_AC_TAGVAR(objext, $1)=$objext
 lt_simple_compile_test_code="int some_variable = 0;\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+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
@@ -3135,12 +3197,12 @@ lt_save_path_LD=$lt_cv_path_LD
 if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 else
-  unset lt_cv_prog_gnu_ld
+  $as_unset lt_cv_prog_gnu_ld
 fi
 if test -n "${lt_cv_path_LDCXX+set}"; then
   lt_cv_path_LD=$lt_cv_path_LDCXX
 else
-  unset lt_cv_path_LD
+  $as_unset lt_cv_path_LD
 fi
 test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
@@ -3235,6 +3297,7 @@ case $host_os in
 	    ;;
 	  esac
 	done
+	;;
       esac
 
       exp_sym_flag='-bexport'
@@ -3272,6 +3335,7 @@ case $host_os in
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 	fi
+	;;
       esac
       shared_flag='-shared'
       if test "$aix_use_runtimelinking" = yes; then
@@ -3303,12 +3367,12 @@ case $host_os in
       _LT_AC_SYS_LIBPATH_AIX
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
       if test "$host_cpu" = ia64; then
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
       else
 	# Determine the default libpath from the value encoded in an empty executable.
 	_LT_AC_SYS_LIBPATH_AIX
@@ -3317,16 +3381,26 @@ case $host_os in
 	# -berok will link without error, but may produce a broken library.
 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
 	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
 	# 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'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
     ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
   chorus*)
     case $cc_basename in
       *)
@@ -3336,7 +3410,6 @@ 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.
@@ -3346,7 +3419,7 @@ case $host_os in
     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 
     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is; otherwise, prepend...
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -3355,7 +3428,7 @@ case $host_os in
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
     else
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
@@ -3492,34 +3565,23 @@ case $host_os in
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
       case $host_cpu in
-      hppa*64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      hppa*64*|ia64*)
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-        ;;
-      ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
         ;;
       *)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
       esac
     fi
     case $host_cpu in
-    hppa*64*)
+    hppa*64*|ia64*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
-    ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
     *)
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
@@ -3535,8 +3597,11 @@ case $host_os 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'
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -3556,8 +3621,11 @@ case $host_os in
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
 	    case $host_cpu in
-	    ia64*|hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	    hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    *)
 	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -3571,6 +3639,20 @@ case $host_os in
 	;;
     esac
     ;;
+  interix3*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
   irix5* | irix6*)
     case $cc_basename in
       CC*)
@@ -3853,19 +3935,6 @@ case $host_os in
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  sco*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
   sunos4*)
     case $cc_basename in
       CC*)
@@ -3958,8 +4027,59 @@ case $host_os in
 	;;
     esac
     ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
     ;;
   tandem*)
     case $cc_basename in
@@ -3996,8 +4116,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
 AC_LIBTOOL_PROG_LD_SHLIBS($1)
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
 
 AC_LIBTOOL_CONFIG($1)
 
@@ -4015,7 +4133,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 ])# AC_LIBTOOL_LANG_CXX_CONFIG
 
 # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
+# ------------------------------------
 # Figure out "hidden" library dependencies from verbose
 # compiler output when linking a shared library.
 # Parse the compiler output and extract the necessary
@@ -4148,6 +4266,14 @@ $rm -f confest.$objext
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
+interix3*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_AC_TAGVAR(predep_objects,$1)=
+  _LT_AC_TAGVAR(postdep_objects,$1)=
+  _LT_AC_TAGVAR(postdeps,$1)=
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
@@ -4157,6 +4283,7 @@ solaris*)
     _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
     ;;
   esac
+  ;;
 esac
 ])
 
@@ -4166,7 +4293,7 @@ esac
 ])# AC_LIBTOOL_POSTDEP_PREDEP
 
 # AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
+# --------------------------
 # Ensure that the configuration vars for the C compiler are
 # suitably defined.  Those variables are subsequently used by
 # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
@@ -4250,8 +4377,6 @@ AC_MSG_CHECKING([whether to build static libraries])
 test "$enable_shared" = yes || enable_static=yes
 AC_MSG_RESULT([$enable_static])
 
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
 _LT_AC_TAGVAR(GCC, $1)="$G77"
 _LT_AC_TAGVAR(LD, $1)="$LD"
 
@@ -4261,8 +4386,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
 AC_LIBTOOL_PROG_LD_SHLIBS($1)
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
 
 AC_LIBTOOL_CONFIG($1)
 
@@ -4319,8 +4442,6 @@ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
 AC_LIBTOOL_PROG_LD_SHLIBS($1)
 AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
 
 AC_LIBTOOL_CONFIG($1)
 
@@ -4330,7 +4451,7 @@ CC="$lt_save_CC"
 
 
 # AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
+# -------------------------
 # Ensure that the configuration vars for the Windows resource compiler are
 # suitably defined.  Those variables are subsequently used by
 # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
@@ -4393,7 +4514,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 EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -4562,6 +4683,9 @@ AR_FLAGS=$lt_AR_FLAGS
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 
@@ -4935,9 +5059,18 @@ irix* | nonstopux*)
 osf*)
   symcode='[[BCDEGQRST]]'
   ;;
-solaris* | sysv5*)
+solaris*)
   symcode='[[BDRT]]'
   ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
 sysv4)
   symcode='[[DFNSTU]]'
   ;;
@@ -5120,6 +5253,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
     sysv4*MP*)
       if test -d /usr/nec; then
 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
@@ -5189,14 +5326,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	case $cc_basename in
 	  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"
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 	    if test "$host_cpu" != ia64; then
 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	    fi
 	    ;;
 	  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"
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
@@ -5210,6 +5347,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
 	  CC*)
@@ -5289,15 +5430,6 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       psos*)
 	;;
-      sco*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
       solaris*)
 	case $cc_basename in
 	  CC*)
@@ -5339,7 +5471,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      unixware*)
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _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'
+	    ;;
+	esac
 	;;
       vxworks*)
 	;;
@@ -5386,6 +5525,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -5500,11 +5644,6 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    sco3.2v5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-      ;;
-
     solaris*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5522,7 +5661,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       _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'
@@ -5535,6 +5674,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _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'
+      ;;
+
     unicos*)
       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
@@ -5576,6 +5721,16 @@ case $host_os in
     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
 ])
 
 
@@ -5602,6 +5757,9 @@ ifelse([$1],[CXX],[
   cygwin* | mingw*)
     _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'
   ;;
+  kfreebsd*-gnu)
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+  ;;
   linux*)
     _LT_AC_TAGVAR(link_all_deplibs, $1)=no
   ;;
@@ -5657,6 +5815,10 @@ ifelse([$1],[CXX],[
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -5741,7 +5903,7 @@ EOF
       _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'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -5750,12 +5912,27 @@ EOF
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
+    interix3*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
     linux*)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
@@ -5798,7 +5975,7 @@ EOF
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	cat <<EOF 1>&2
@@ -5819,6 +5996,33 @@ EOF
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -5852,7 +6056,7 @@ EOF
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -5886,6 +6090,7 @@ EOF
   	    break
   	  fi
 	  done
+	  ;;
 	esac
 
 	exp_sym_flag='-bexport'
@@ -5923,6 +6128,7 @@ EOF
   	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
   	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
 	if test "$aix_use_runtimelinking" = yes; then
@@ -5935,11 +6141,11 @@ EOF
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
+	  if test "$aix_use_runtimelinking" = yes; then
 	    shared_flag='${wl}-G'
 	  else
 	    shared_flag='${wl}-bM:SRE'
-  	fi
+	  fi
 	fi
       fi
 
@@ -5953,12 +6159,12 @@ EOF
        # Determine the default libpath from the value encoded in an empty executable.
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 _LT_AC_SYS_LIBPATH_AIX
@@ -5967,13 +6173,11 @@ EOF
 	  # -berok will link without error, but may produce a broken library.
 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
 	  # 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'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -6091,11 +6295,20 @@ EOF
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | 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
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+      
+    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+    kfreebsd*-gnu)
       _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
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
       ;;
 
     hpux9*)
@@ -6114,47 +6327,62 @@ EOF
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	case $host_cpu in
-	hppa*64*|ia64*)
+	hppa*64*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
 	*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
 	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
 	*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 
@@ -6256,14 +6484,6 @@ EOF
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
       ;;
 
-    sco3.2v5*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
       if test "$GCC" = yes; then
@@ -6349,36 +6569,45 @@ EOF
       fi
       ;;
 
-    sysv4.2uw2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    sysv5*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      _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'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -6396,11 +6625,6 @@ EOF
 AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
 test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -6428,6 +6652,7 @@ x|xyes)
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
         compiler_flags=-v
         linker_flags=-v
         verstring=
diff --git a/config.h.in b/config.h.in
index 9a4e967..3a828c9 100644
--- a/config.h.in
+++ b/config.h.in
@@ -29,6 +29,14 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if GCC special attributes are supported */
+#undef HAVE_GCC_ATTRIBUTES
+
+#ifndef HAVE_GCC_ATTRIBUTES
+/* This should really be a C99 anonymous variadic macro. */
+#define __attribute__(attr)
+#endif
+
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
diff --git a/configure b/configure
index a97e889..e703ef5 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.131 .
+# From configure.ac Revision: 1.133 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for gutenprint 5.0.0-rc2.
 #
@@ -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 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_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 gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH LIBOBJS LTLIBOBJS LTALLOCA'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3461,7 +3461,7 @@ 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'
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
@@ -3477,36 +3477,43 @@ else
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
 	  break
 	  ;;
 	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
@@ -3614,6 +3621,11 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
+interix3*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $LD in
   *-32|*"-32 ") libmagic=32-bit;;
@@ -3659,15 +3671,11 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
@@ -3688,10 +3696,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
   esac
   ;;
 
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -3709,6 +3720,9 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
@@ -3744,7 +3758,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3747 "configure"' > conftest.$ac_ext
+  echo '#line 3761 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -3899,6 +3913,26 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 
 esac
 
@@ -5206,7 +5240,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5209:" \
+echo "$as_me:5243:" \
      "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
@@ -5407,6 +5441,12 @@ else
     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`
     ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
   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
@@ -5420,6 +5460,17 @@ else
       esac
     fi
     ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    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
@@ -5505,9 +5556,18 @@ irix* | nonstopux*)
 osf*)
   symcode='[BCDEGQRST]'
   ;;
-solaris* | sysv5*)
+solaris*)
   symcode='[BDRT]'
   ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
 sysv4)
   symcode='[DFNSTU]'
   ;;
@@ -5973,6 +6033,7 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -5992,10 +6053,10 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
@@ -6194,6 +6255,9 @@ lt_simple_link_test_code='int main(){return(0);}\n'
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
@@ -6201,82 +6265,17 @@ 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
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/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
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
 
 
-#
-# Check for any special shared library compilation flags.
-#
-lt_prog_cc_shlib=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    lt_prog_cc_shlib='-belf'
-    ;;
-  esac
-fi
-if test -n "$lt_prog_cc_shlib"; then
-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
-  else
-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-    lt_cv_prog_cc_can_build_shared=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   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 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
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-
-if test x"$lt_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
 
 lt_prog_compiler_no_builtin_flag=
 
@@ -6302,17 +6301,17 @@ else
    -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:6305: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6304: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6309: \$? = $ac_status" >&5
+   echo "$as_me:6308: \$? = $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 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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -6373,6 +6372,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -6487,11 +6491,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic='-Kpic'
-      lt_prog_compiler_static='-dn'
-      ;;
-
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -6509,7 +6508,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -6522,6 +6521,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
     unicos*)
       lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_can_build_shared=no
@@ -6564,17 +6569,17 @@ else
    -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:6567: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6572: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6571: \$? = $ac_status" >&5
+   echo "$as_me:6576: \$? = $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 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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works=yes
      fi
    fi
@@ -6605,6 +6610,48 @@ case $host_os in
     ;;
 esac
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # 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 -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/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
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+
+if test x"$lt_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
 echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
@@ -6626,18 +6673,18 @@ else
    -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:6629: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6676: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6633: \$? = $ac_status" >&5
+   echo "$as_me:6680: \$? = $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
-     $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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
@@ -6737,6 +6784,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -6821,7 +6872,7 @@ EOF
       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'
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -6830,12 +6881,27 @@ EOF
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	ld_shlibs=no
       fi
       ;;
 
+    interix3*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
     linux*)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
@@ -6878,7 +6944,7 @@ EOF
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
 	cat <<EOF 1>&2
@@ -6899,6 +6965,33 @@ EOF
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -6932,7 +7025,7 @@ EOF
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct=unsupported
@@ -6966,6 +7059,7 @@ EOF
   	    break
   	  fi
 	  done
+	  ;;
 	esac
 
 	exp_sym_flag='-bexport'
@@ -7003,6 +7097,7 @@ EOF
   	  hardcode_libdir_flag_spec='-L$libdir'
   	  hardcode_libdir_separator=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
 	if test "$aix_use_runtimelinking" = yes; then
@@ -7015,11 +7110,11 @@ EOF
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
+	  if test "$aix_use_runtimelinking" = yes; then
 	    shared_flag='${wl}-G'
 	  else
 	    shared_flag='${wl}-bM:SRE'
-  	fi
+	  fi
 	fi
       fi
 
@@ -7083,12 +7178,12 @@ rm -f conftest.err conftest.$ac_objext \
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -7147,13 +7242,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec=' '
+	  whole_archive_flag_spec='$convenience'
 	  archive_cmds_need_lc=yes
 	  # 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'
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -7271,11 +7364,20 @@ 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 | dragonfly*)
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+    kfreebsd*-gnu)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
+      link_all_deplibs=no
       ;;
 
     hpux9*)
@@ -7294,47 +7396,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       export_dynamic_flag_spec='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	hardcode_direct=yes
+	export_dynamic_flag_spec='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	case $host_cpu in
-	hppa*64*|ia64*)
+	hppa*64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
 	*)
 	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
 	case $host_cpu in
-	hppa*64*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hppa*64*|ia64*)
 	  hardcode_libdir_flag_spec_ld='+b $libdir'
-	  hardcode_libdir_separator=:
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec='-L$libdir'
 	  hardcode_direct=no
 	  hardcode_shlibpath_var=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
 	  ;;
 	*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator=:
 	  hardcode_direct=yes
 	  export_dynamic_flag_spec='${wl}-E'
 
@@ -7436,14 +7553,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_libdir_separator=:
       ;;
 
-    sco3.2v5*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       no_undefined_flag=' -z text'
       if test "$GCC" = yes; then
@@ -7529,36 +7638,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4.2uw2*)
-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
       ;;
 
-    sysv5*)
-      no_undefined_flag=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      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'
-      hardcode_libdir_flag_spec=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -7577,11 +7695,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
 echo "${ECHO_T}$ld_shlibs" >&6
 test "$ld_shlibs" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -7614,6 +7727,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl
+	pic_flag=$lt_prog_compiler_pic
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -7895,10 +8009,15 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -7958,6 +8077,18 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  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'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -8091,6 +8222,7 @@ nto-qnx*)
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
@@ -8134,13 +8266,6 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -8166,7 +8291,7 @@ sunos4*)
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -8199,6 +8324,29 @@ sysv4*MP*)
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -8214,6 +8362,11 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 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=
@@ -8862,7 +9015,7 @@ fi
     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -8878,7 +9031,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8881 "configure"
+#line 9034 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8935,6 +9088,8 @@ int main ()
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }
@@ -8949,7 +9104,7 @@ EOF
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
     esac
   else :
     # compilation failed
@@ -8964,7 +9119,7 @@ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 
     if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
 if test "${lt_cv_dlopen_self_static+set}" = set; then
@@ -8976,7 +9131,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8979 "configure"
+#line 9134 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9033,6 +9188,8 @@ int main ()
       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
       /* dlclose (self); */
     }
+  else
+    puts (dlerror ());
 
     exit (status);
 }
@@ -9047,7 +9204,7 @@ EOF
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
     esac
   else :
     # compilation failed
@@ -9080,7 +9237,7 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 fi
 
 
-# Report which librarie types wil actually be built
+# Report which library types will actually be built
 echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
 echo "$as_me:$LINENO: result: $can_build_shared" >&5
@@ -9130,7 +9287,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 EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -9296,6 +9453,9 @@ AR_FLAGS=$lt_AR_FLAGS
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler
 
@@ -9626,6 +9786,9 @@ echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script
 echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     fi
   fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
 
   # Extract list of available tagged configurations in $ofile.
   # Note that this assumes the entire list is on one line.
@@ -9678,6 +9841,7 @@ hardcode_libdir_flag_spec_CXX=
 hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
 hardcode_automatic_CXX=no
 module_cmds_CXX=
 module_expsym_cmds_CXX=
@@ -9705,13 +9869,16 @@ objext_CXX=$objext
 lt_simple_compile_test_code="int some_variable = 0;\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
+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.
 
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
@@ -9719,13 +9886,13 @@ 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
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/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
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
 
@@ -9740,12 +9907,12 @@ lt_save_path_LD=$lt_cv_path_LD
 if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 else
-  unset lt_cv_prog_gnu_ld
+  $as_unset lt_cv_prog_gnu_ld
 fi
 if test -n "${lt_cv_path_LDCXX+set}"; then
   lt_cv_path_LD=$lt_cv_path_LDCXX
 else
-  unset lt_cv_path_LD
+  $as_unset lt_cv_path_LD
 fi
 test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
@@ -9956,6 +10123,7 @@ case $host_os in
 	    ;;
 	  esac
 	done
+	;;
       esac
 
       exp_sym_flag='-bexport'
@@ -9993,6 +10161,7 @@ case $host_os in
 	  hardcode_libdir_flag_spec_CXX='-L$libdir'
 	  hardcode_libdir_separator_CXX=
 	fi
+	;;
       esac
       shared_flag='-shared'
       if test "$aix_use_runtimelinking" = yes; then
@@ -10074,12 +10243,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
       if test "$host_cpu" = ia64; then
 	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
 	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
       else
 	# Determine the default libpath from the value encoded in an empty executable.
 	cat >conftest.$ac_ext <<_ACEOF
@@ -10138,16 +10307,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# -berok will link without error, but may produce a broken library.
 	no_undefined_flag_CXX=' ${wl}-bernotok'
 	allow_undefined_flag_CXX=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	always_export_symbols_CXX=yes
 	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX=' '
+	whole_archive_flag_spec_CXX='$convenience'
 	archive_cmds_need_lc_CXX=yes
 	# 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'
+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
     ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      allow_undefined_flag_CXX=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      ld_shlibs_CXX=no
+    fi
+    ;;
+
   chorus*)
     case $cc_basename in
       *)
@@ -10157,7 +10336,6 @@ 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.
@@ -10167,7 +10345,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     enable_shared_with_static_runtimes_CXX=yes
 
     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is; otherwise, prepend...
       archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -10176,7 +10354,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
     else
       ld_shlibs_CXX=no
     fi
@@ -10313,34 +10491,23 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
+      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator_CXX=:
+
       case $host_cpu in
-      hppa*64*)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+      hppa*64*|ia64*)
 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-	hardcode_libdir_separator_CXX=:
-        ;;
-      ia64*)
-	hardcode_libdir_flag_spec_CXX='-L$libdir'
         ;;
       *)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
 	export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
       esac
     fi
     case $host_cpu in
-    hppa*64*)
+    hppa*64*|ia64*)
       hardcode_direct_CXX=no
       hardcode_shlibpath_var_CXX=no
       ;;
-    ia64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
     *)
       hardcode_direct_CXX=yes
       hardcode_minus_L_CXX=yes # Not in the search PATH,
@@ -10356,8 +10523,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
       aCC*)
 	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	hppa*64*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	  ;;
 	*)
 	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -10377,8 +10547,11 @@ 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
-	    ia64*|hppa*64*)
-	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+	    hppa*64*)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      ;;
 	    *)
 	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -10392,6 +10565,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
     esac
     ;;
+  interix3*)
+    hardcode_direct_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+    export_dynamic_flag_spec_CXX='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
   irix5* | irix6*)
     case $cc_basename in
       CC*)
@@ -10674,19 +10861,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  sco*)
-    archive_cmds_need_lc_CXX=no
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
   sunos4*)
     case $cc_basename in
       CC*)
@@ -10779,8 +10953,59 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
     esac
     ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+    no_undefined_flag_CXX='${wl}-z,text'
+    archive_cmds_need_lc_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    no_undefined_flag_CXX='${wl}-z,text'
+    allow_undefined_flag_CXX='${wl}-z,nodefs'
     archive_cmds_need_lc_CXX=no
+    hardcode_shlibpath_var_CXX=no
+    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    hardcode_libdir_separator_CXX=':'
+    link_all_deplibs_CXX=yes
+    export_dynamic_flag_spec_CXX='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
     ;;
   tandem*)
     case $cc_basename in
@@ -10915,6 +11140,14 @@ $rm -f confest.$objext
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
+interix3*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
@@ -10924,6 +11157,7 @@ solaris*)
     postdeps_CXX='-lCstd -lCrun'
     ;;
   esac
+  ;;
 esac
 
 
@@ -10974,6 +11208,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
     sysv4*MP*)
       if test -d /usr/nec; then
 	lt_prog_compiler_pic_CXX=-Kconform_pic
@@ -11043,14 +11281,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	case $cc_basename in
 	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
 	    if test "$host_cpu" != ia64; then
 	      lt_prog_compiler_pic_CXX='+Z'
 	    fi
 	    ;;
 	  aCC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
 	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
@@ -11064,6 +11302,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	    ;;
 	esac
 	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
 	  CC*)
@@ -11143,15 +11385,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	;;
       psos*)
 	;;
-      sco*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
       solaris*)
 	case $cc_basename in
 	  CC*)
@@ -11193,7 +11426,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	    ;;
 	esac
 	;;
-      unixware*)
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
 	;;
       vxworks*)
 	;;
@@ -11229,17 +11469,17 @@ else
    -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:11232: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11472: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11236: \$? = $ac_status" >&5
+   echo "$as_me:11476: \$? = $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 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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_CXX=yes
      fi
    fi
@@ -11270,6 +11510,48 @@ case $host_os in
     ;;
 esac
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # 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 -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
+
+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
 echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
@@ -11291,18 +11573,18 @@ else
    -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:11294: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11576: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11298: \$? = $ac_status" >&5
+   echo "$as_me:11580: \$? = $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
-     $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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
      fi
    fi
@@ -11363,6 +11645,9 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   cygwin* | mingw*)
     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'
   ;;
+  kfreebsd*-gnu)
+    link_all_deplibs_CXX=no
+  ;;
   linux*)
     link_all_deplibs_CXX=no
   ;;
@@ -11375,11 +11660,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 echo "${ECHO_T}$ld_shlibs_CXX" >&6
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -11412,6 +11692,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_CXX
+	pic_flag=$lt_prog_compiler_pic_CXX
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -11693,10 +11974,15 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -11756,6 +12042,18 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  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'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -11889,6 +12187,7 @@ nto-qnx*)
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
@@ -11932,13 +12231,6 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -11964,7 +12256,7 @@ sunos4*)
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -11997,6 +12289,29 @@ sysv4*MP*)
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12012,6 +12327,11 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 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=
@@ -12049,834 +12369,6 @@ elif test "$shlibpath_overrides_runpath" = yes ||
   enable_fast_install=needless
 fi
 
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 12679 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 12777 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -12891,7 +12383,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 EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -13009,6 +12501,9 @@ AR_FLAGS=$lt_AR_FLAGS
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_CXX
 
@@ -13351,6 +12846,9 @@ lt_simple_link_test_code="      program t\n      end\n"
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
@@ -13358,13 +12856,13 @@ 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
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/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
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
 
@@ -13420,8 +12918,6 @@ test "$enable_shared" = yes || enable_static=yes
 echo "$as_me:$LINENO: result: $enable_static" >&5
 echo "${ECHO_T}$enable_static" >&6
 
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
 GCC_F77="$G77"
 LD_F77="$LD"
 
@@ -13468,6 +12964,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -13582,11 +13083,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic_F77='-Kpic'
-      lt_prog_compiler_static_F77='-dn'
-      ;;
-
     solaris*)
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -13604,7 +13100,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl_F77='-Wl,'
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -13617,6 +13113,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_pic_F77='-KPIC'
+      lt_prog_compiler_static_F77='-Bstatic'
+      ;;
+
     unicos*)
       lt_prog_compiler_wl_F77='-Wl,'
       lt_prog_compiler_can_build_shared_F77=no
@@ -13659,17 +13161,17 @@ else
    -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:13662: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13164: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13666: \$? = $ac_status" >&5
+   echo "$as_me:13168: \$? = $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 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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_F77=yes
      fi
    fi
@@ -13700,6 +13202,48 @@ case $host_os in
     ;;
 esac
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works_F77=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # 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 -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works_F77=yes
+       fi
+     else
+       lt_prog_compiler_static_works_F77=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
+
+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+    :
+else
+    lt_prog_compiler_static_F77=
+fi
+
+
 echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
@@ -13721,18 +13265,18 @@ else
    -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:13724: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13268: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13728: \$? = $ac_status" >&5
+   echo "$as_me:13272: \$? = $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
-     $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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_F77=yes
      fi
    fi
@@ -13832,6 +13376,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -13916,7 +13464,7 @@ EOF
       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'
+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -13925,12 +13473,27 @@ EOF
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	ld_shlibs_F77=no
       fi
       ;;
 
+    interix3*)
+      hardcode_direct_F77=no
+      hardcode_shlibpath_var_F77=no
+      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec_F77='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
     linux*)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
@@ -13973,7 +13536,7 @@ EOF
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_F77=no
 	cat <<EOF 1>&2
@@ -13994,6 +13557,33 @@ EOF
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs_F77=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs_F77=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -14027,7 +13617,7 @@ EOF
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct_F77=unsupported
@@ -14061,6 +13651,7 @@ EOF
   	    break
   	  fi
 	  done
+	  ;;
 	esac
 
 	exp_sym_flag='-bexport'
@@ -14098,6 +13689,7 @@ EOF
   	  hardcode_libdir_flag_spec_F77='-L$libdir'
   	  hardcode_libdir_separator_F77=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
 	if test "$aix_use_runtimelinking" = yes; then
@@ -14110,11 +13702,11 @@ EOF
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
+	  if test "$aix_use_runtimelinking" = yes; then
 	    shared_flag='${wl}-G'
 	  else
 	    shared_flag='${wl}-bM:SRE'
-  	fi
+	  fi
 	fi
       fi
 
@@ -14168,12 +13760,12 @@ rm -f conftest.err conftest.$ac_objext \
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
        hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -14222,13 +13814,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag_F77=' ${wl}-bernotok'
 	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_F77=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77=' '
+	  whole_archive_flag_spec_F77='$convenience'
 	  archive_cmds_need_lc_F77=yes
 	  # 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'
+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -14346,13 +13936,22 @@ 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 | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
       hardcode_shlibpath_var_F77=no
       ;;
 
+    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+    kfreebsd*-gnu)
+      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      link_all_deplibs_F77=no
+      ;;
+
     hpux9*)
       if test "$GCC" = yes; then
 	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -14369,47 +13968,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       export_dynamic_flag_spec_F77='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_F77=:
+
+	hardcode_direct_F77=yes
+	export_dynamic_flag_spec_F77='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L_F77=yes
+      fi
+      ;;
+
+    hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	case $host_cpu in
-	hppa*64*|ia64*)
+	hppa*64*)
 	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
+	ia64*)
+	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
 	*)
 	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hppa*64*)
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_F77=:
+
 	case $host_cpu in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+	hppa*64*|ia64*)
 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_libdir_separator_F77=:
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_F77='-L$libdir'
 	  hardcode_direct_F77=no
 	  hardcode_shlibpath_var_F77=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
 	  ;;
 	*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_F77=:
 	  hardcode_direct_F77=yes
 	  export_dynamic_flag_spec_F77='${wl}-E'
 
@@ -14511,14 +14125,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_libdir_separator_F77=:
       ;;
 
-    sco3.2v5*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       no_undefined_flag_F77=' -z text'
       if test "$GCC" = yes; then
@@ -14604,36 +14210,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4.2uw2*)
-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      no_undefined_flag_F77='${wl}-z,text'
+      archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_F77='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
       ;;
 
-    sysv5*)
-      no_undefined_flag_F77=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      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'
-      hardcode_libdir_flag_spec_F77=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag_F77='${wl}-z,text'
+      allow_undefined_flag_F77='${wl}-z,nodefs'
+      archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
+      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator_F77=':'
+      link_all_deplibs_F77=yes
+      export_dynamic_flag_spec_F77='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -14652,11 +14267,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
 echo "${ECHO_T}$ld_shlibs_F77" >&6
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -14689,6 +14299,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_F77
+	pic_flag=$lt_prog_compiler_pic_F77
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -14970,10 +14581,15 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -15033,6 +14649,18 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  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'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -15166,6 +14794,7 @@ nto-qnx*)
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
@@ -15209,13 +14838,6 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -15241,7 +14863,7 @@ sunos4*)
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -15274,6 +14896,29 @@ sysv4*MP*)
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15289,6 +14934,11 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 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=
@@ -15326,36 +14976,6 @@ elif test "$shlibpath_overrides_runpath" = yes ||
   enable_fast_install=needless
 fi
 
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -15370,7 +14990,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 EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -15488,6 +15108,9 @@ AR_FLAGS=$lt_AR_FLAGS
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_F77
 
@@ -15798,6 +15421,9 @@ lt_simple_link_test_code='public class conftest { public static void main(String
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
@@ -15805,13 +15431,13 @@ 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
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/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
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
 
@@ -15862,17 +15488,17 @@ else
    -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:15865: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15491: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15869: \$? = $ac_status" >&5
+   echo "$as_me:15495: \$? = $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 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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -15933,6 +15559,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@ -16047,11 +15678,6 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
-    sco3.2v5*)
-      lt_prog_compiler_pic_GCJ='-Kpic'
-      lt_prog_compiler_static_GCJ='-dn'
-      ;;
-
     solaris*)
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16069,7 +15695,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl_GCJ='-Wl,'
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16082,6 +15708,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       fi
       ;;
 
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_pic_GCJ='-KPIC'
+      lt_prog_compiler_static_GCJ='-Bstatic'
+      ;;
+
     unicos*)
       lt_prog_compiler_wl_GCJ='-Wl,'
       lt_prog_compiler_can_build_shared_GCJ=no
@@ -16124,17 +15756,17 @@ else
    -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:16127: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15759: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16131: \$? = $ac_status" >&5
+   echo "$as_me:15763: \$? = $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 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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_GCJ=yes
      fi
    fi
@@ -16165,6 +15797,48 @@ case $host_os in
     ;;
 esac
 
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_prog_compiler_static_works_GCJ=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # 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 -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works_GCJ=yes
+       fi
+     else
+       lt_prog_compiler_static_works_GCJ=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
+
+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+    :
+else
+    lt_prog_compiler_static_GCJ=
+fi
+
+
 echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
@@ -16186,18 +15860,18 @@ else
    -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:16189: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15863: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16193: \$? = $ac_status" >&5
+   echo "$as_me:15867: \$? = $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
-     $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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_GCJ=yes
      fi
    fi
@@ -16297,6 +15971,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -16381,7 +16059,7 @@ EOF
       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'
+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
 	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -16390,12 +16068,27 @@ EOF
 	  echo EXPORTS > $output_objdir/$soname.def;
 	  cat $export_symbols >> $output_objdir/$soname.def;
 	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	ld_shlibs_GCJ=no
       fi
       ;;
 
+    interix3*)
+      hardcode_direct_GCJ=no
+      hardcode_shlibpath_var_GCJ=no
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec_GCJ='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
     linux*)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
@@ -16438,7 +16131,7 @@ EOF
       fi
       ;;
 
-    solaris* | sysv5*)
+    solaris*)
       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_GCJ=no
 	cat <<EOF 1>&2
@@ -16459,6 +16152,33 @@ EOF
       fi
       ;;
 
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs_GCJ=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    ld_shlibs_GCJ=no
+	  fi
+	;;
+      esac
+      ;;
+
     sunos4*)
       archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
@@ -16492,7 +16212,7 @@ EOF
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct_GCJ=unsupported
@@ -16526,6 +16246,7 @@ EOF
   	    break
   	  fi
 	  done
+	  ;;
 	esac
 
 	exp_sym_flag='-bexport'
@@ -16563,6 +16284,7 @@ EOF
   	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
   	  hardcode_libdir_separator_GCJ=
 	  fi
+	  ;;
 	esac
 	shared_flag='-shared'
 	if test "$aix_use_runtimelinking" = yes; then
@@ -16575,11 +16297,11 @@ EOF
   	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
-  	if test "$aix_use_runtimelinking" = yes; then
+	  if test "$aix_use_runtimelinking" = yes; then
 	    shared_flag='${wl}-G'
 	  else
 	    shared_flag='${wl}-bM:SRE'
-  	fi
+	  fi
 	fi
       fi
 
@@ -16643,12 +16365,12 @@ rm -f conftest.err conftest.$ac_objext \
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
        hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
        else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
@@ -16707,13 +16429,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag_GCJ=' ${wl}-bernotok'
 	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_GCJ=yes
 	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ=' '
+	  whole_archive_flag_spec_GCJ='$convenience'
 	  archive_cmds_need_lc_GCJ=yes
 	  # 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'
+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
@@ -16831,11 +16551,20 @@ 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 | dragonfly*)
+    freebsd* | dragonfly*)
+      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
+    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+    kfreebsd*-gnu)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
       hardcode_shlibpath_var_GCJ=no
+      link_all_deplibs_GCJ=no
       ;;
 
     hpux9*)
@@ -16854,47 +16583,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       export_dynamic_flag_spec_GCJ='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_GCJ=:
+
+	hardcode_direct_GCJ=yes
+	export_dynamic_flag_spec_GCJ='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L_GCJ=yes
+      fi
+      ;;
+
+    hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 	case $host_cpu in
-	hppa*64*|ia64*)
+	hppa*64*)
 	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
+	ia64*)
+	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
 	*)
 	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hppa*64*)
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator_GCJ=:
+
 	case $host_cpu in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+	hppa*64*|ia64*)
 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_libdir_separator_GCJ=:
 	  hardcode_direct_GCJ=no
 	  hardcode_shlibpath_var_GCJ=no
 	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
 	*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_GCJ=:
 	  hardcode_direct_GCJ=yes
 	  export_dynamic_flag_spec_GCJ='${wl}-E'
 
@@ -16996,14 +16740,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_libdir_separator_GCJ=:
       ;;
 
-    sco3.2v5*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
     solaris*)
       no_undefined_flag_GCJ=' -z text'
       if test "$GCC" = yes; then
@@ -17089,36 +16825,45 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4.2uw2*)
-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      no_undefined_flag_GCJ='${wl}-z,text'
+      archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
+      runpath_var='LD_RUN_PATH'
 
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
       ;;
 
-    sysv5*)
-      no_undefined_flag_GCJ=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      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'
-      hardcode_libdir_flag_spec_GCJ=
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag_GCJ='${wl}-z,text'
+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
+      archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator_GCJ=':'
+      link_all_deplibs_GCJ=yes
+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
       ;;
 
     uts4*)
@@ -17137,11 +16882,6 @@ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
 echo "${ECHO_T}$ld_shlibs_GCJ" >&6
 test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
 #
 # Do we need to explicitly link libc?
 #
@@ -17174,6 +16914,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         libobjs=conftest.$ac_objext
         deplibs=
         wl=$lt_prog_compiler_wl_GCJ
+	pic_flag=$lt_prog_compiler_pic_GCJ
         compiler_flags=-v
         linker_flags=-v
         verstring=
@@ -17455,10 +17196,15 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
-  *) # from 3.2 on
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
   esac
   ;;
 
@@ -17518,6 +17264,18 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
+interix3*)
+  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'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
@@ -17651,6 +17409,7 @@ nto-qnx*)
 
 openbsd*)
   version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
@@ -17694,13 +17453,6 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -17726,7 +17478,7 @@ sunos4*)
   need_version=yes
   ;;
 
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -17759,6 +17511,29 @@ sysv4*MP*)
   fi
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -17774,6 +17549,11 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
 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=
@@ -17811,834 +17591,6 @@ elif test "$shlibpath_overrides_runpath" = yes ||
   enable_fast_install=needless
 fi
 
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  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'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 18441 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 18539 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -18653,7 +17605,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 EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -18771,6 +17723,9 @@ AR_FLAGS=$lt_AR_FLAGS
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_GCJ
 
@@ -19080,6 +18035,9 @@ lt_simple_link_test_code="$lt_simple_compile_test_code"
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
@@ -19087,13 +18045,13 @@ 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
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/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
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
 
@@ -19128,7 +18086,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 EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -19246,6 +18204,9 @@ AR_FLAGS=$lt_AR_FLAGS
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_RC
 
@@ -25842,6 +24803,68 @@ fi
 
 
 
+echo "$as_me:$LINENO: checking if $CC supports __attribute__ syntax" >&5
+echo $ECHO_N "checking if $CC supports __attribute__ syntax... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+typedef struct __attribute__((__packed__)) {
+   unsigned char foo;
+   char bar;
+   long baz;
+} test_struct_t;
+int
+main ()
+{
+test_struct_t mystruct;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  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'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                   cat >>confdefs.h <<\_ACEOF
+#define HAVE_GCC_ATTRIBUTES 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
+
+
+
 if test "$USE_READLINE" = yes ; then
   if test "$EXTRA_LIBREADLINE_DEPS" = "" ; then
     unset ac_cv_lib_readline_readline
@@ -31254,7 +30277,7 @@ cat >>confdefs.h <<_ACEOF
 #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
 _ACEOF
 
-RELEASE_DATE="22 Nov 2005"
+RELEASE_DATE="22 Jan 2006"
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE "${RELEASE_DATE}"
@@ -31301,9 +30324,11 @@ RM='rm'
 gutenprint_libs="${GUTENPRINT_LIBS} ${gutenprint_libdeps}"
 
 
+
 gutenprintui_libs="${GUTENPRINTUI_LIBS} ${gutenprintui_libdeps}"
 
 
+
 gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 
 
@@ -31311,6 +30336,7 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 
 
 
+
           ac_config_files="$ac_config_files Makefile"
 
           ac_config_files="$ac_config_files doc/Makefile"
@@ -32412,10 +31438,13 @@ s,@GUTENPRINTUI2_LIBDEPS@,$GUTENPRINTUI2_LIBDEPS,;t t
 s,@GUTENPRINTUI2_VERSION@,$GUTENPRINTUI2_VERSION,;t t
 s,@gutenprint_cflags@,$gutenprint_cflags,;t t
 s,@gutenprint_libs@,$gutenprint_libs,;t t
+s,@gutenprint_libdeps@,$gutenprint_libdeps,;t t
 s,@gutenprintui_cflags@,$gutenprintui_cflags,;t t
 s,@gutenprintui_libs@,$gutenprintui_libs,;t t
+s,@gutenprintui_libdeps@,$gutenprintui_libdeps,;t t
 s,@gutenprintui2_cflags@,$gutenprintui2_cflags,;t t
 s,@gutenprintui2_libs@,$gutenprintui2_libs,;t t
+s,@gutenprintui2_libdeps@,$gutenprintui2_libdeps,;t t
 s,@LIBREADLINE_DEPS@,$LIBREADLINE_DEPS,;t t
 s,@MAINTAINER_CFLAGS@,$MAINTAINER_CFLAGS,;t t
 s,@PLUG_IN_PATH@,$PLUG_IN_PATH,;t t
diff --git a/configure.ac b/configure.ac
index 80b8ebb..ec1d2ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.131 2005/11/21 11:16:22 rleigh Exp $
+dnl $Id: configure.ac,v 1.133 2006/01/13 16:09:14 rleigh Exp $
 dnl Copyright (C) 2001-2004 Roger Leigh
 dnl 
 dnl This program is free software; you can redistribute it and/or modify
@@ -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.131 $)
+AC_REVISION($Revision: 1.133 $)
 AC_CONFIG_SRCDIR(src/main/print-vars.c)
 AC_CONFIG_AUX_DIR(scripts)
 STP_INIT
@@ -618,6 +618,25 @@ if test x$ENABLE_PROFILE = xyes ; then
 fi
 AC_SUBST(GNUCFLAGS)
 
+AH_TEMPLATE([HAVE_GCC_ATTRIBUTES],
+            [Define to 1 if GCC special attributes are supported])
+AC_MSG_CHECKING([if $CC supports __attribute__ syntax])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([typedef struct __attribute__((__packed__)) {
+   unsigned char foo;
+   char bar;
+   long baz;
+} test_struct_t;],
+                                   [test_struct_t mystruct;])],
+                  [AC_MSG_RESULT([yes])]
+                   AC_DEFINE([HAVE_GCC_ATTRIBUTES], 1),
+                  [AC_MSG_RESULT([no])])
+
+AH_VERBATIM([HAVE_GCC_ATTRIBUTES_BOILERPLATE],
+[#ifndef HAVE_GCC_ATTRIBUTES
+/* This should really be a C99 anonymous variadic macro. */
+#define __attribute__(attr)
+#endif])
+
 dnl Checks for libraries.
 dnl When checking readline, check using extra libraries first.
 dnl We want to protect against the link somehow succeeding, but only
@@ -899,12 +918,15 @@ AC_SUBST(GUTENPRINTUI2_VERSION)
 AC_SUBST(gutenprint_cflags)
 gutenprint_libs="${GUTENPRINT_LIBS} ${gutenprint_libdeps}"
 AC_SUBST(gutenprint_libs)
+AC_SUBST(gutenprint_libdeps)
 AC_SUBST(gutenprintui_cflags)
 gutenprintui_libs="${GUTENPRINTUI_LIBS} ${gutenprintui_libdeps}"
 AC_SUBST(gutenprintui_libs)
+AC_SUBST(gutenprintui_libdeps)
 AC_SUBST(gutenprintui2_cflags)
 gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 AC_SUBST(gutenprintui2_libs)
+AC_SUBST(gutenprintui2_libdeps)
 AC_SUBST(LIBREADLINE_DEPS)
 AC_SUBST(MAINTAINER_CFLAGS)
 AC_SUBST(PLUG_IN_PATH)
diff --git a/debian/changelog b/debian/changelog
index b741c29..23e3273 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+gutenprint (4.3.99+cvs20060121.dfsg.1-1) unstable; urgency=low
+
+  * New upstream release candidate (5.0.0-rc2).
+  * The many options provided by Gutenprint are now documented, and this
+    documentation (gutenprint-options) is now provided for the
+    cupsys-driver-gutenprint, ijsgimpprint and gimp-print packages in their
+    documentation directories (Closes: #323172).
+  * Revert accidental conversion to a debian-native source package in the last
+    release.
+  * debian/cupsys-driver-gimpprint.postinst,
+    debian/cupsys-driver-gimpprint.postrm: Use invoke-rc.d when reloading
+    cupsys, and don't fail if cupsys fails to reload.  Patches pulled from
+    the Ubuntu patch repository for gimp-print.
+
+ -- Roger Leigh <rleigh@debian.org>  Sun, 22 Jan 2006 14:21:19 +0000
+
 gutenprint (4.3.99+cvs20051122.dfsg.1-2) unstable; urgency=low
 
   * debian/control.in: Remove xlibs-dev from Build-Depends, in
diff --git a/debian/cupsys-driver-gutenprint.docs b/debian/cupsys-driver-gutenprint.docs
index 0b55f7f..f35d48a 100644
--- a/debian/cupsys-driver-gutenprint.docs
+++ b/debian/cupsys-driver-gutenprint.docs
@@ -1,2 +1,3 @@
 README
 doc/FAQ.html
+doc/gutenprint-options
diff --git a/debian/cupsys-driver-gutenprint.postinst b/debian/cupsys-driver-gutenprint.postinst
index 0784757..40e9ab1 100644
--- a/debian/cupsys-driver-gutenprint.postinst
+++ b/debian/cupsys-driver-gutenprint.postinst
@@ -29,7 +29,7 @@ if [ "$1" = "configure" ]; then
   /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
+  [ -x /etc/init.d/cupsys ] && invoke-rc.d cupsys force-reload || true
 elif [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ] || [ "$1" = "abort-deconfigure" ]; then
   :
 else
diff --git a/debian/cupsys-driver-gutenprint.postrm b/debian/cupsys-driver-gutenprint.postrm
index 63c1b49..9be9afc 100644
--- a/debian/cupsys-driver-gutenprint.postrm
+++ b/debian/cupsys-driver-gutenprint.postrm
@@ -19,7 +19,7 @@ set -e
 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
+    [ -x /etc/init.d/cupsys ] && invoke-rc.d cupsys force-reload || true
 fi
 
 if [ "$1" = purge ]; then
diff --git a/debian/gimp-print.docs b/debian/gimp-print.docs
index 7610b61..bda832f 100644
--- a/debian/gimp-print.docs
+++ b/debian/gimp-print.docs
@@ -1,3 +1,4 @@
 README
 doc/*.html
 doc/*.png
+doc/gutenprint-options
diff --git a/debian/ijsgutenprint.docs b/debian/ijsgutenprint.docs
new file mode 100644
index 0000000..a60ec8d
--- /dev/null
+++ b/debian/ijsgutenprint.docs
@@ -0,0 +1 @@
+doc/gutenprint-options
diff --git a/debian/patches/05_genppdconfig_remove_perlmenu.dpatch b/debian/patches/05_genppdconfig_remove_perlmenu.dpatch
index afbd9d2..afbd9d2 100755..100644
--- a/debian/patches/05_genppdconfig_remove_perlmenu.dpatch
+++ b/debian/patches/05_genppdconfig_remove_perlmenu.dpatch
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4a280c8..cffff42 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.42 2005/11/21 11:16:22 rleigh Exp $
+## $Id: Makefile.am,v 1.43 2006/01/14 20:03:39 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -51,19 +51,19 @@ gutenprint-stamp: gutenprint.dox $(top_srcdir)/configure
 
 docs: gutenprint-stamp
 	cd developer; $(MAKE)
-	cd users_guide; $(MAKE)
 
 ps: $(MANUAL).ps
 	cd developer; $(MAKE) ps
-	cd users_guide; $(MAKE) ps
 
 pdf: $(MANUAL).pdf
 	cd developer; $(MAKE) pdf
-	cd users_guide; $(MAKE) pdf
 
 html: 
 	cd developer; $(MAKE) html
-	cd users_guide; $(MAKE) html
+
+install-data-local: $(srcdir)/gutenprint-options
+	$(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc
+	$(INSTALL_DATA) $(srcdir)/gutenprint-options $(DESTDIR)$(datadir)/$(PACKAGE)/doc
 
 
 ## Clean
@@ -83,6 +83,7 @@ EXTRA_DIST = \
 	gutenprint \
 	gutenprintui2 \
 	gutenprint-stamp \
-	gutenprintui2-stamp
+	gutenprintui2-stamp \
+	gutenprint-options
 
 .PHONY: html ps pdf docs
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9f5d134..db984be 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -281,10 +281,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
@@ -321,7 +324,8 @@ EXTRA_DIST = \
 	gutenprint \
 	gutenprintui2 \
 	gutenprint-stamp \
-	gutenprintui2-stamp
+	gutenprintui2-stamp \
+	gutenprint-options
 
 all: all-recursive
 
@@ -592,7 +596,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am:
+install-data-am: install-data-local
 
 install-exec-am:
 
@@ -624,10 +628,10 @@ uninstall-info: uninstall-info-recursive
 	ctags ctags-recursive distclean distclean-generic \
 	distclean-libtool distclean-recursive distclean-tags distdir \
 	dvi dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
+	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 \
+	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local maintainer-clean-recursive mostlyclean \
 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
@@ -671,19 +675,19 @@ gutenprint-stamp: gutenprint.dox $(top_srcdir)/configure
 
 docs: gutenprint-stamp
 	cd developer; $(MAKE)
-	cd users_guide; $(MAKE)
 
 ps: $(MANUAL).ps
 	cd developer; $(MAKE) ps
-	cd users_guide; $(MAKE) ps
 
 pdf: $(MANUAL).pdf
 	cd developer; $(MAKE) pdf
-	cd users_guide; $(MAKE) pdf
 
 html: 
 	cd developer; $(MAKE) html
-	cd users_guide; $(MAKE) html
+
+install-data-local: $(srcdir)/gutenprint-options
+	$(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc
+	$(INSTALL_DATA) $(srcdir)/gutenprint-options $(DESTDIR)$(datadir)/$(PACKAGE)/doc
 
 maintainer-clean-local:
 	$(RM) -r gutenprint
diff --git a/doc/README.maintaining b/doc/README.maintaining
index 4d3c8da..3bfa6ec 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.20 2005/11/21 20:06:30 rleigh Exp $
+ $Id: README.maintaining,v 1.21 2005/12/29 00:41:23 rleigh Exp $
 
 
 1. Setting up the autotools
@@ -66,7 +66,7 @@ v.   GNU make (any recent version)
 
 and also
 
-vi.  pkg-config (at least 0.15.0)
+vi.  pkg-config (at least 0.18.0)
 
 GNU autoconf made some incompatible changes between the 2.13 and 2.50
 stable releases.  You cannot use a configure.in written for 2.13 with
diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in
index 2a98d84..4a01053 100644
--- a/doc/developer/Makefile.in
+++ b/doc/developer/Makefile.in
@@ -271,10 +271,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf
index 4d8ad0a..ae94158 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
new file mode 100644
index 0000000..731655e
--- /dev/null
+++ b/doc/developer/reference-html/HTML.manifest
@@ -0,0 +1,18 @@
+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/index.html b/doc/developer/reference-html/book1.html
index 0c894e7..8c8b39c 100644
--- a/doc/developer/reference-html/index.html
+++ b/doc/developer/reference-html/book1.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,14 +8,11 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="NEXT"
 TITLE="Preface"
-HREF="f14.html"></HEAD
+HREF="f14.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="book"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="BOOK"
 ><A
@@ -35,35 +32,10 @@ CLASS="corpauthor"
   </H3
 ><P
 CLASS="copyright"
->Copyright &copy; 2003 The Gutenprint Project</P
-><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
+HREF="ln10.html"
+>Copyright</A
+> &copy; 2003 The Gutenprint Project</P
 ><HR></DIV
 ><DIV
 CLASS="TOC"
@@ -90,24 +62,24 @@ HREF="c48.html"
 ><DD
 ><DL
 ><DT
->2.1. <A
+><A
 HREF="c48.html#AEN51"
 >Code prerequisites</A
 ></DT
 ><DT
->2.2. <A
+><A
 HREF="x67.html"
 >Linking with libgutenprint</A
 ></DT
 ><DT
->2.3. <A
+><A
 HREF="x79.html"
 >Integrating libgutenprint</A
 ></DT
 ><DD
 ><DL
 ><DT
->2.3.1. <A
+><A
 HREF="x79.html#AEN86"
 ><B
 CLASS="command"
@@ -115,7 +87,7 @@ CLASS="command"
 ></A
 ></DT
 ><DT
->2.3.2. <A
+><A
 HREF="x79.html#AEN123"
 ><B
 CLASS="command"
@@ -123,7 +95,7 @@ CLASS="command"
 ></A
 ></DT
 ><DT
->2.3.3. <A
+><A
 HREF="x79.html#AEN133"
 ><B
 CLASS="command"
@@ -131,7 +103,7 @@ CLASS="command"
 ></A
 ></DT
 ><DT
->2.3.4. <A
+><A
 HREF="x79.html#AEN150"
 ><B
 CLASS="command"
@@ -155,7 +127,7 @@ HREF="c200.html"
 ><DD
 ><DL
 ><DT
->4.1. <A
+><A
 HREF="c200.html#AEN217"
 ><TT
 CLASS="filename"
@@ -163,24 +135,24 @@ CLASS="filename"
 ></A
 ></DT
 ><DT
->4.2. <A
+><A
 HREF="x271.html"
 >The driver file</A
 ></DT
 ><DD
 ><DL
 ><DT
->4.2.1. <A
+><A
 HREF="x271.html#AEN281"
 >Epson inkjet printers</A
 ></DT
 ><DT
->4.2.2. <A
+><A
 HREF="x271.html#AEN403"
 >Tuning the printer</A
 ></DT
 ><DT
->4.2.3. <A
+><A
 HREF="x271.html#AEN433"
 >Canon inkjet printers</A
 ></DT
@@ -196,17 +168,17 @@ HREF="c464.html"
 ><DD
 ><DL
 ><DT
->5.1. <A
+><A
 HREF="c464.html#AEN477"
 >Standard commands</A
 ></DT
 ><DT
->5.2. <A
+><A
 HREF="x955.html"
 >Remote Mode Commands</A
 ></DT
 ><DT
->5.3. <A
+><A
 HREF="x1669.html"
 >Appropriate Remote Commands</A
 ></DT
@@ -220,39 +192,39 @@ HREF="c1717.html"
 ><DD
 ><DL
 ><DT
->6.1. <A
+><A
 HREF="c1717.html#AEN1719"
 >Introduction</A
 ></DT
 ><DT
->6.2. <A
+><A
 HREF="x1734.html"
 >Weaving algorithms</A
 ></DT
 ><DD
 ><DL
 ><DT
->6.2.1. <A
+><A
 HREF="x1734.html#AEN1740"
 >Simple weaving algorithms</A
 ></DT
 ><DT
->6.2.2. <A
+><A
 HREF="x1734.html#AEN1757"
 >Perfect weaving</A
 ></DT
 ><DT
->6.2.3. <A
+><A
 HREF="x1734.html#AEN1791"
 >Weaving collisions</A
 ></DT
 ><DT
->6.2.4. <A
+><A
 HREF="x1734.html#AEN1809"
->What makes a &#8220;perfect&#8221; weave?</A
+>What makes a “perfect� weave?</A
 ></DT
 ><DT
->6.2.5. <A
+><A
 HREF="x1734.html#AEN1937"
 >Oversampling</A
 ></DT
@@ -267,86 +239,86 @@ HREF="c1968.html"
 ></DT
 ><DT
 >A. <A
-HREF="a2122.html"
+HREF="gpl.html"
 >GNU General Public License</A
 ></DT
 ><DD
 ><DL
 ><DT
->A.1. <A
-HREF="a2122.html#gpl-preamble"
+><A
+HREF="gpl.html#gpl-preamble"
 >Preamble</A
 ></DT
 ><DT
->A.2. <A
-HREF="x2153.html"
+><A
+HREF="gpl-terms.html"
 >TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</A
 ></DT
 ><DD
 ><DL
 ><DT
->A.2.1. <A
-HREF="x2153.html#gpl-sect0"
+><A
+HREF="gpl-terms.html#gpl-sect0"
 >Section 0</A
 ></DT
 ><DT
->A.2.2. <A
-HREF="x2153.html#gpl-sect1"
+><A
+HREF="gpl-terms.html#gpl-sect1"
 >Section 1</A
 ></DT
 ><DT
->A.2.3. <A
-HREF="x2153.html#gpl-sect2"
+><A
+HREF="gpl-terms.html#gpl-sect2"
 >Section 2</A
 ></DT
 ><DT
->A.2.4. <A
-HREF="x2153.html#gpl-sect3"
+><A
+HREF="gpl-terms.html#gpl-sect3"
 >Section 3</A
 ></DT
 ><DT
->A.2.5. <A
-HREF="x2153.html#gpl-sect4"
+><A
+HREF="gpl-terms.html#gpl-sect4"
 >Section 4</A
 ></DT
 ><DT
->A.2.6. <A
-HREF="x2153.html#gpl-sect5"
+><A
+HREF="gpl-terms.html#gpl-sect5"
 >Section 5</A
 ></DT
 ><DT
->A.2.7. <A
-HREF="x2153.html#gpl-sect6"
+><A
+HREF="gpl-terms.html#gpl-sect6"
 >Section 6</A
 ></DT
 ><DT
->A.2.8. <A
-HREF="x2153.html#gpl-sect7"
+><A
+HREF="gpl-terms.html#gpl-sect7"
 >Section 7</A
 ></DT
 ><DT
->A.2.9. <A
-HREF="x2153.html#gpl-sect8"
+><A
+HREF="gpl-terms.html#gpl-sect8"
 >Section 8</A
 ></DT
 ><DT
->A.2.10. <A
-HREF="x2153.html#gpl-sect9"
+><A
+HREF="gpl-terms.html#gpl-sect9"
 >Section 9</A
 ></DT
 ><DT
->A.2.11. <A
-HREF="x2153.html#gpl-sect10"
+><A
+HREF="gpl-terms.html#gpl-sect10"
 >Section 10</A
 ></DT
 ><DT
->A.2.12. <A
-HREF="x2153.html#gpl-sect11"
+><A
+HREF="gpl-terms.html#gpl-sect11"
 >NO WARRANTY</A
 ></DT
 ><DT
->A.2.13. <A
-HREF="x2153.html#gpl-sect12"
+><A
+HREF="gpl-terms.html#gpl-sect12"
 >Section 12</A
 ></DT
 ></DL
diff --git a/doc/developer/reference-html/c1717.html b/doc/developer/reference-html/c1717.html
index 8e09502..3a40313 100644
--- a/doc/developer/reference-html/c1717.html
+++ b/doc/developer/reference-html/c1717.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,20 +8,17 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="PREVIOUS"
 TITLE="Appropriate Remote Commands"
 HREF="x1669.html"><LINK
 REL="NEXT"
 TITLE="Weaving algorithms"
-HREF="x1734.html"></HEAD
+HREF="x1734.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="chapter"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -73,18 +70,37 @@ 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"
->6.1. Introduction</A
+>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
@@ -99,12 +115,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
->&#8482;</SUP
+>â„¢</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
@@ -112,7 +128,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
@@ -155,11 +171,11 @@ NAME="AEN1719"
 ><P
 >&#13;      Interestingly, apparently the Windows (and presumably Macintosh)
       drivers for most or all Epson printers still list a
-      &#8220;microweave&#8221; mode.  Experiments have demonstrated
-      that this does not in fact use the &#8220;microweave&#8221; mode
+      “microweave� mode.  Experiments have demonstrated
+      that this does not in fact use the “microweave� mode
       of the printer.  Possibly it does nothing, or it uses a
       different weave pattern from what the
-      &#8220;non-microweave&#8221; mode does.  This is unnecessarily
+      “non-microweave� mode does.  This is unnecessarily
       confusing, at least for people who write drivers who try to
       explain them to people who don't.
     </P
@@ -240,7 +256,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/c194.html b/doc/developer/reference-html/c194.html
index 5ed6bd7..40d250a 100644
--- a/doc/developer/reference-html/c194.html
+++ b/doc/developer/reference-html/c194.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,20 +8,17 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="PREVIOUS"
 TITLE="Integrating libgutenprint"
 HREF="x79.html"><LINK
 REL="NEXT"
 TITLE="Adding a new printer"
-HREF="c200.html"></HEAD
+HREF="c200.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="chapter"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -129,7 +126,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/c1968.html b/doc/developer/reference-html/c1968.html
index e03ce26..6604cc4 100644
--- a/doc/developer/reference-html/c1968.html
+++ b/doc/developer/reference-html/c1968.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,20 +8,17 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="PREVIOUS"
 TITLE="Weaving algorithms"
 HREF="x1734.html"><LINK
 REL="NEXT"
 TITLE="GNU General Public License"
-HREF="a2122.html"></HEAD
+HREF="gpl.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="chapter"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -56,7 +53,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="a2122.html"
+HREF="gpl.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -149,7 +146,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 &#8216;ordered&#8217;.  However, they all share
+    The other one is ‘ordered’.  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
@@ -186,7 +183,7 @@ CLASS="literal"
   </P
 ><P
 >&#13;    Error diffusion works by taking the output error at a given
-    pixel and &#8220;diffusing&#8221; it into surrounding pixels.
+    pixel and “diffusing� 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
@@ -208,7 +205,7 @@ CLASS="literal"
   </P
 ><P
 >&#13;    There are two sub-classes of error diffusion that we use here,
-    &#8216;random&#8217; and &#8216;hybrid&#8217;.  One of the
+    ‘random’ and ‘hybrid’.  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
@@ -219,7 +216,7 @@ CLASS="literal"
   </P
 ><P
 >&#13;    There is one additional variant (on both sub-classes), called
-    &#8216;adaptive hybrid&#8217; and &#8216;adaptive random&#8217;.
+    ‘adaptive hybrid’ and ‘adaptive random’.
     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
@@ -240,7 +237,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&#8212;in principle.  In practice, the black
+    magenta, and yellow—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
@@ -325,7 +322,7 @@ TYPE="1"
 ></LI
 ><LI
 ><P
->&#13;        Compute the &#8220;virtual value&#8221;.  The virtual value
+>&#13;        Compute the “virtual value�.  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
@@ -366,7 +363,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
@@ -485,16 +482,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
@@ -915,7 +912,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -924,7 +921,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="a2122.html"
+HREF="gpl.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
diff --git a/doc/developer/reference-html/c200.html b/doc/developer/reference-html/c200.html
index cd26eae..a995e70 100644
--- a/doc/developer/reference-html/c200.html
+++ b/doc/developer/reference-html/c200.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,20 +8,17 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="PREVIOUS"
 TITLE="Reporting Bugs"
 HREF="c194.html"><LINK
 REL="NEXT"
 TITLE="The driver file"
-HREF="x271.html"></HEAD
+HREF="x271.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="chapter"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -72,6 +69,28 @@ 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.
@@ -131,7 +150,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN217"
->4.1. <TT
+><TT
 CLASS="filename"
 >printers.xml</TT
 ></A
@@ -155,6 +174,12 @@ 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;
@@ -163,6 +188,9 @@ CLASS="programlisting"
 &#60;gamma value="0.597"/&#62;
 &#60;density value="1.0"/&#62;
 &#60;/printer&#62;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -325,7 +353,7 @@ CLASS="literal"
 > attribute may be
             set to a positive integer.  This is passed into the
             driver, which may do whatever it cares to with
-            it&#8212;index into a table, compute on, or whatever.
+            it—index into a table, compute on, or whatever.
             This need not be unique.
           </P
 ></DD
@@ -358,7 +386,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/c39.html b/doc/developer/reference-html/c39.html
index 3021576..1b6ce3e 100644
--- a/doc/developer/reference-html/c39.html
+++ b/doc/developer/reference-html/c39.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,20 +8,17 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="PREVIOUS"
 TITLE="Preface"
 HREF="f14.html"><LINK
 REL="NEXT"
 TITLE="Using libgutenprint"
-HREF="c48.html"></HEAD
+HREF="c48.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="chapter"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -114,7 +111,7 @@ CLASS="emphasis"
 ><P
 >&#13;    Gutenprint is licensed under the terms of the GNU General Public
     License (GPL), reproduced in <A
-HREF="a2122.html"
+HREF="gpl.html"
 >Appendix A</A
 >.
   </P
@@ -144,7 +141,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/c464.html b/doc/developer/reference-html/c464.html
index cb3bede..059dc9a 100644
--- a/doc/developer/reference-html/c464.html
+++ b/doc/developer/reference-html/c464.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,20 +8,17 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="PREVIOUS"
 TITLE="The driver file"
 HREF="x271.html"><LINK
 REL="NEXT"
 TITLE="Remote Mode Commands"
-HREF="x955.html"></HEAD
+HREF="x955.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="chapter"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -72,6 +69,30 @@ 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
@@ -100,10 +121,10 @@ CLASS="literal"
     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
-    &#8216;<TT
+    ‘<TT
 CLASS="literal"
 >(</TT
->&#8217; (left parenthesis) followed by
+>’ (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.
@@ -133,7 +154,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN477"
->5.1. Standard commands</A
+>Standard commands</A
 ></H1
 ><P
 ></P
@@ -281,7 +302,7 @@ CLASS="varname"
             <CODE
 CLASS="constant"
 >2</CODE
->; in 1440×720 DPI mode,
+>; in 1440×720 DPI mode,
             <CODE
 CLASS="varname"
 >PAGEUNIT</CODE
@@ -376,7 +397,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
@@ -391,7 +412,7 @@ CLASS="constant"
 ></DT
 ><DD
 ><P
->&#13;                  &#8220;Full-overlap&#8221;
+>&#13;                  “Full-overlap�
                 </P
 ></DD
 ><DT
@@ -401,7 +422,7 @@ CLASS="constant"
 ></DT
 ><DD
 ><P
->&#13;                  &#8220;Four-pass&#8221;
+>&#13;                  “Four-pass�
                 </P
 ></DD
 ><DT
@@ -411,7 +432,7 @@ CLASS="constant"
 ></DT
 ><DD
 ><P
->&#13;                  &#8220;Full-overlap 2&#8221;
+>&#13;                  “Full-overlap 2�
                 </P
 ></DD
 ></DL
@@ -552,7 +573,7 @@ CLASS="varname"
 ></DT
 ><DD
 ><P
->&#13;            Set the length of the page in &#8220;pageunits&#8221;
+>&#13;            Set the length of the page in “pageunits�
             (see <TT
 CLASS="literal"
 >ESC (U</TT
@@ -595,7 +616,7 @@ CLASS="varname"
 ><DD
 ><P
 >&#13;            Set the vertical page margins of the page in
-            &#8220;pageunits&#8221; (see <TT
+            “pageunits� (see <TT
 CLASS="literal"
 >ESC (U</TT
 >
@@ -625,7 +646,7 @@ CLASS="varname"
 ><DD
 ><P
 >&#13;            Set the width and length of the printed page region in
-            &#8220;pageunits&#8221; (see <TT
+            “pageunits� (see <TT
 CLASS="literal"
 >ESC (U</TT
 >
@@ -660,7 +681,7 @@ CLASS="varname"
 CLASS="varname"
 >ADVANCE</CODE
 >
-            &#8220;vertical units&#8221; (see <TT
+            “vertical units� (see <TT
 CLASS="literal"
 >ESC
             (U</TT
@@ -696,7 +717,7 @@ CLASS="varname"
 CLASS="varname"
 >ADVANCE</CODE
 >
-            &#8220;vertical units&#8221; (see <TT
+            “vertical units� (see <TT
 CLASS="literal"
 >ESC
             (U</TT
@@ -800,7 +821,7 @@ CLASS="varname"
 >OFFSET</CODE
 >
             from the previous print head position, measured in
-            &#8220;horizontal units&#8221; (see <TT
+            “horizontal units� (see <TT
 CLASS="literal"
 >ESC
             (U</TT
@@ -1037,7 +1058,7 @@ CLASS="constant"
 ></TD
 ><TD
 >&#13;                    TIFF compression (incorrectly documented as
-                    &#8220;run length encoded&#8221;)
+                    “run length encoded�)
                   </TD
 ></TR
 ><TR
@@ -1070,7 +1091,7 @@ CLASS="constant"
             <CODE
 CLASS="constant"
 >40</CODE
-> (8 × 5}).  On some other
+> (8 × 5}).  On some other
             printers, it varies.
           </P
 ><P
@@ -1283,7 +1304,7 @@ CLASS="constant"
 >16</CODE
 ></TD
 ><TD
->Gray (&#8220;light black&#8221;)</TD
+>Gray (“light black�)</TD
 ></TR
 ><TR
 ><TD
@@ -1358,7 +1379,7 @@ CLASS="constant"
 ></TD
 ><TD
 >&#13;                    TIFF compression (incorrectly documented as
-                    &#8220;run length encoded&#8221;)
+                    “run length encoded�)
                   </TD
 ></TR
 ><TR
@@ -1369,7 +1390,7 @@ CLASS="constant"
 ></TD
 ><TD
 >&#13;                    TIFF compression with a special command set, or
-                    &#8220;run length encoding 2&#8221; on some
+                    “run length encoding 2� on some
                     printers.
                   </TD
 ></TR
@@ -1387,7 +1408,7 @@ CLASS="varname"
 CLASS="varname"
 >BYTES</CODE
 > is the number of bytes wide for
-            each row (ceiling(BITS × width_of_row, 8)}). Note
+            each row (ceiling(BITS × width_of_row, 8)}). Note
             that this is different from the <TT
 CLASS="literal"
 >ESC .</TT
@@ -1456,11 +1477,11 @@ CLASS="varname"
 >VERTICAL</CODE
 > is the distance in these
             units between printed rows; it should be
-            ((separation_in_nozzles × <CODE
+            ((separation_in_nozzles × <CODE
 CLASS="varname"
 >BASE</CODE
 >
-            ÷ 720).
+            ÷ 720).
           </P
 ><P
 >&#13;            <CODE
@@ -1468,8 +1489,8 @@ CLASS="varname"
 >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.
@@ -1486,7 +1507,7 @@ CLASS="varname"
 ></DT
 ><DD
 ><P
->&#13;            Enters &#8220;remote mode&#8221;.  This is a special,
+>&#13;            Enters “remote mode�.  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.
@@ -1514,6 +1535,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN937"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >@EJL ID\r
@@ -1523,6 +1550,9 @@ MDL:[printer model];
 CLS:PRINTER;
 DES:EPSON [printer model];
 \f</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1548,10 +1578,19 @@ 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
@@ -1565,6 +1604,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN944"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >magic command
@@ -1582,6 +1627,9 @@ 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
@@ -1595,9 +1643,18 @@ 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
@@ -1611,12 +1668,21 @@ 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
@@ -1630,10 +1696,19 @@ 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
@@ -1664,7 +1739,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/c48.html b/doc/developer/reference-html/c48.html
index 3e4767b..907e61a 100644
--- a/doc/developer/reference-html/c48.html
+++ b/doc/developer/reference-html/c48.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,20 +8,17 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="PREVIOUS"
 TITLE="Copying, modification and redistribution"
 HREF="c39.html"><LINK
 REL="NEXT"
 TITLE="Linking with libgutenprint"
-HREF="x67.html"></HEAD
+HREF="x67.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="chapter"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -72,6 +69,30 @@ 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.
@@ -82,7 +103,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN51"
->2.1. Code prerequisites</A
+>Code prerequisites</A
 ></H1
 ><P
 >&#13;      To use libgutenprint with a program, several steps must be taken:
@@ -100,9 +121,18 @@ 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
@@ -135,6 +165,12 @@ 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;
@@ -145,6 +181,9 @@ main (int argc, char *argv[])
   return 0;
 }
       </PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -175,7 +214,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/docbook.css b/doc/developer/reference-html/docbook.css
new file mode 100644
index 0000000..0f90516
--- /dev/null
+++ b/doc/developer/reference-html/docbook.css
@@ -0,0 +1,12 @@
+.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 203891e..b9e5ab2 100644
--- a/doc/developer/reference-html/f14.html
+++ b/doc/developer/reference-html/f14.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,20 +8,17 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="PREVIOUS"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="NEXT"
 TITLE="Copying, modification and redistribution"
-HREF="c39.html"></HEAD
+HREF="c39.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="preface"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -42,7 +39,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -80,7 +77,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
-    &#8220;photographic quality&#8221; models which offer very high
+    “photographic quality� 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.
@@ -161,7 +158,7 @@ CLASS="command"
 >&#13;    <P
 CLASS="literallayout"
 >We&nbsp;hope&nbsp;you&nbsp;enjoy&nbsp;using&nbsp;Gutenprint!<br>
-&#8212;The&nbsp;Gutenprint&nbsp;project<br>
+—The&nbsp;Gutenprint&nbsp;project<br>
 &nbsp;&nbsp;&nbsp;&nbsp;</P
 >
   </P
@@ -182,7 +179,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -191,7 +188,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/x2153.html b/doc/developer/reference-html/gpl-terms.html
index 4ccc109..a457062 100644
--- a/doc/developer/reference-html/x2153.html
+++ b/doc/developer/reference-html/gpl-terms.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,20 +8,17 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="UP"
 TITLE="GNU General Public License"
-HREF="a2122.html"><LINK
+HREF="gpl.html"><LINK
 REL="PREVIOUS"
 TITLE="GNU General Public License"
-HREF="a2122.html"></HEAD
+HREF="gpl.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="sect1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -42,7 +39,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="a2122.html"
+HREF="gpl.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -67,7 +64,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="gpl-terms"
->A.2. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</A
+>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</A
 ></H1
 ><DIV
 CLASS="sect2"
@@ -75,7 +72,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect0"
->A.2.1. Section 0</A
+>Section 0</A
 ></H2
 ><P
 >&#13;	This License applies to any program or other work which
@@ -115,7 +112,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect1"
->A.2.2. Section 1</A
+>Section 1</A
 ></H2
 ><P
 >&#13;	You may copy and distribute verbatim copies of the Program's
@@ -138,14 +135,14 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect2"
->A.2.3. Section 2</A
+>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="x2153.html#gpl-sect1"
+HREF="gpl-terms.html#gpl-sect1"
 >Section 1</A
 > above, provided
 	that you also meet all of these conditions:
@@ -184,43 +181,18 @@ TYPE="a"
 
 	      <DIV
 CLASS="note"
-><P
-></P
-><TABLE
+><BLOCKQUOTE
 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
-></TH
-></TR
-><TR
-><TD
->&nbsp;</TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
 ><P
->&#13;		  If the Program itself is interactive but does not
+><B
+>Exception:: </B
+>
+		  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
-></TD
-></TR
-></TABLE
+></BLOCKQUOTE
 ></DIV
 >
 
@@ -262,19 +234,19 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect3"
->A.2.4. Section 3</A
+>Section 3</A
 ></H2
 ><P
 >&#13;	You may copy and distribute the Program (or a work based on
 	it, under <A
-HREF="x2153.html#gpl-sect2"
+HREF="gpl-terms.html#gpl-sect2"
 >Section 2</A
 > in object
 	code or executable form under the terms of <A
-HREF="x2153.html#gpl-sect1"
+HREF="gpl-terms.html#gpl-sect1"
 >Sections 1</A
 > and <A
-HREF="x2153.html#gpl-sect2"
+HREF="gpl-terms.html#gpl-sect2"
 >2</A
 > above provided that you also do
 	one of the following:
@@ -343,7 +315,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect4"
->A.2.5. Section 4</A
+>Section 4</A
 ></H2
 ><P
 >&#13;	You may not copy, modify, sublicense, or distribute the
@@ -362,7 +334,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect5"
->A.2.6. Section 5</A
+>Section 5</A
 ></H2
 ><P
 >&#13;	You are not required to accept this License, since you have
@@ -382,7 +354,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect6"
->A.2.7. Section 6</A
+>Section 6</A
 ></H2
 ><P
 >&#13;	Each time you redistribute the Program (or any work based on
@@ -400,7 +372,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect7"
->A.2.8. Section 7</A
+>Section 7</A
 ></H2
 ><P
 >&#13;	If, as a consequence of a court judgment or allegation of
@@ -448,7 +420,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect8"
->A.2.9. Section 8</A
+>Section 8</A
 ></H2
 ><P
 >&#13;	If the distribution and/or use of the Program is restricted in
@@ -467,7 +439,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect9"
->A.2.10. Section 9</A
+>Section 9</A
 ></H2
 ><P
 >&#13;	The Free Software Foundation may publish revised and/or new
@@ -492,7 +464,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect10"
->A.2.11. Section 10</A
+>Section 10</A
 ></H2
 ><P
 >&#13;	If you wish to incorporate parts of the Program into other
@@ -512,7 +484,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect11"
->A.2.12. NO WARRANTY</A
+>NO WARRANTY</A
 ></H2
 ><FONT
 COLOR="RED"
@@ -536,7 +508,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect12"
->A.2.13. Section 12</A
+>Section 12</A
 ></H2
 ><P
 >&#13;	IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
@@ -569,7 +541,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="a2122.html"
+HREF="gpl.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -578,7 +550,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -599,7 +571,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="a2122.html"
+HREF="gpl.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/doc/developer/reference-html/a2122.html b/doc/developer/reference-html/gpl.html
index df22a8b..ccdc927 100644
--- a/doc/developer/reference-html/a2122.html
+++ b/doc/developer/reference-html/gpl.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,20 +8,17 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="PREVIOUS"
 TITLE="Dithering"
 HREF="c1968.html"><LINK
 REL="NEXT"
 TITLE="TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
-HREF="x2153.html"></HEAD
+HREF="gpl-terms.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="appendix"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -56,7 +53,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="x2153.html"
+HREF="gpl-terms.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -73,12 +70,31 @@ 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"
->A.1. Preamble</A
+>Preamble</A
 ></H1
 ><P
 >&#13;      The licenses for most software are designed to take away your
@@ -182,7 +198,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -191,7 +207,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="x2153.html"
+HREF="gpl-terms.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
diff --git a/doc/developer/reference-html/ln10.html b/doc/developer/reference-html/ln10.html
new file mode 100644
index 0000000..cf959ef
--- /dev/null
+++ b/doc/developer/reference-html/ln10.html
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><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
new file mode 100644
index 0000000..9cc2e15
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/caution.gif
diff --git a/doc/developer/reference-html/stylesheet-images/home.gif b/doc/developer/reference-html/stylesheet-images/home.gif
new file mode 100644
index 0000000..55e1d59
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/home.gif
diff --git a/doc/developer/reference-html/stylesheet-images/important.gif b/doc/developer/reference-html/stylesheet-images/important.gif
new file mode 100644
index 0000000..25e40c7
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/important.gif
diff --git a/doc/developer/reference-html/stylesheet-images/next.gif b/doc/developer/reference-html/stylesheet-images/next.gif
new file mode 100644
index 0000000..8c502e7
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/next.gif
diff --git a/doc/developer/reference-html/stylesheet-images/note.gif b/doc/developer/reference-html/stylesheet-images/note.gif
new file mode 100644
index 0000000..7322e8e
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/note.gif
diff --git a/doc/developer/reference-html/stylesheet-images/prev.gif b/doc/developer/reference-html/stylesheet-images/prev.gif
new file mode 100644
index 0000000..0894d9e
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/prev.gif
diff --git a/doc/developer/reference-html/stylesheet-images/tip.gif b/doc/developer/reference-html/stylesheet-images/tip.gif
new file mode 100644
index 0000000..f062955
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/tip.gif
diff --git a/doc/developer/reference-html/stylesheet-images/toc-blank.gif b/doc/developer/reference-html/stylesheet-images/toc-blank.gif
new file mode 100644
index 0000000..6c65e3a
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/toc-blank.gif
diff --git a/doc/developer/reference-html/stylesheet-images/toc-minus.gif b/doc/developer/reference-html/stylesheet-images/toc-minus.gif
new file mode 100644
index 0000000..40ebe61
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/toc-minus.gif
diff --git a/doc/developer/reference-html/stylesheet-images/toc-plus.gif b/doc/developer/reference-html/stylesheet-images/toc-plus.gif
new file mode 100644
index 0000000..3e9e7d5
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/toc-plus.gif
diff --git a/doc/developer/reference-html/stylesheet-images/up.gif b/doc/developer/reference-html/stylesheet-images/up.gif
new file mode 100644
index 0000000..e899a27
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/up.gif
diff --git a/doc/developer/reference-html/stylesheet-images/warning.gif b/doc/developer/reference-html/stylesheet-images/warning.gif
new file mode 100644
index 0000000..a587079
--- /dev/null
+++ b/doc/developer/reference-html/stylesheet-images/warning.gif
diff --git a/doc/developer/reference-html/x1669.html b/doc/developer/reference-html/x1669.html
index 1080dee..9f290fe 100644
--- a/doc/developer/reference-html/x1669.html
+++ b/doc/developer/reference-html/x1669.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="UP"
 TITLE="ESC/P2"
 HREF="c464.html"><LINK
@@ -17,14 +17,11 @@ TITLE="Remote Mode Commands"
 HREF="x955.html"><LINK
 REL="NEXT"
 TITLE="Weaving for inkjet printers"
-HREF="c1717.html"></HEAD
+HREF="c1717.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="sect1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -74,7 +71,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN1669"
->5.3. Appropriate Remote Commands</A
+>Appropriate Remote Commands</A
 ></H1
 ><P
 >&#13;        All of the remote commands described above are wrapped up with
@@ -82,7 +79,7 @@ NAME="AEN1669"
         <TT
 CLASS="literal"
 >00 00 00</TT
-> and the &#8220;magic&#8221;
+> and the “magic�
         command described above, then two <TT
 CLASS="literal"
 >ESC @</TT
@@ -135,7 +132,7 @@ CLASS="literal"
 ></LI
 ><LI
 ><P
->&#13;            If the user said &#8220;realign&#8221;, meaning he isn't
+>&#13;            If the user said “realign�, meaning he isn't
             done yet, go to step 1.
           </P
 ></LI
@@ -160,6 +157,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1693"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >PM 00 00
@@ -167,6 +170,9 @@ SN 00 00 00
 EX 00 00 00 00 05 01
 ST 00 01
 SM 00 02</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -180,6 +186,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1696"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >PM 00 00
@@ -189,6 +201,9 @@ 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
@@ -202,10 +217,19 @@ 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
@@ -223,13 +247,13 @@ CLASS="literal"
 CLASS="literal"
 >SN</TT
 > command above;
-        the arguments to the second (&#8220;platen gap&#8221;) are
+        the arguments to the second (“platen gap�) are
         <TT
 CLASS="literal"
 >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
+> for thick papers (“matte
+        paper—heavyweight�, “photo paper� and
+        “premium glossy photo paper�) and <TT
 CLASS="literal"
 >00 01
         00</TT
@@ -306,7 +330,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/x1734.html b/doc/developer/reference-html/x1734.html
index 8c52bfd..1a3623a 100644
--- a/doc/developer/reference-html/x1734.html
+++ b/doc/developer/reference-html/x1734.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="UP"
 TITLE="Weaving for inkjet printers"
 HREF="c1717.html"><LINK
@@ -17,14 +17,11 @@ TITLE="Weaving for inkjet printers"
 HREF="c1717.html"><LINK
 REL="NEXT"
 TITLE="Dithering"
-HREF="c1968.html"></HEAD
+HREF="c1968.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="sect1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -74,11 +71,11 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN1734"
->6.2. Weaving algorithms</A
+>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 &#8722;
+      one I devised let me use only (jets −
       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
@@ -88,13 +85,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)
-      &#8220;MicroWeave&#8221;.
+      “MicroWeave�.
     </P
 ><P
 >&#13;      Yet another complication is how to get near the top and bottom
@@ -128,7 +125,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN1740"
->6.2.1. Simple weaving algorithms</A
+>Simple weaving algorithms</A
 ></H2
 ><P
 >&#13;        The initial problem is to calculate the starting position of
@@ -141,12 +138,12 @@ NAME="AEN1740"
       </P
 ><P
 >&#13;        Once we have a formula for the starting row of each pass, we
-        then turn that &#8220;inside out&#8221; to get a formula for
+        then turn that “inside out� 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 &#8220;rows&#8221;; the
+        vertical position on the paper in “rows�; the
         resolution with which the printer can position the paper
         vertically.  The print head contains J ink jets, which are
         spaced S rows apart.
@@ -160,7 +157,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
@@ -170,6 +167,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1747"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >pass number
@@ -183,6 +186,9 @@ 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
@@ -204,7 +210,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.)
@@ -215,7 +221,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
-        &#8220;pass block&#8221;: we print extra passes to fill in
+        “pass block�: we print extra passes to fill in
         the empty rows.  A naive implementation might look like
         this:
       </P
@@ -226,6 +232,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1754"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >0 *---*---*---*---*---*---*
@@ -240,12 +252,15 @@ CLASS="screen"
 9                                                          *---*---*---*---*---*
 10                                                          *---*---*---*---*---
 11                                                           *---*---*---*---*--</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><P
 >&#13;        (Now you can see why this process is called
-        &#8220;weaving&#8221;!)
+        “weaving�!)
       </P
 ></DIV
 ><DIV
@@ -254,7 +269,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN1757"
->6.2.2. Perfect weaving</A
+>Perfect weaving</A
 ></H2
 ><P
 >&#13;        This simple weave pattern prints every row, but will give
@@ -271,15 +286,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 &#8220;perfect&#8221; weave looks like:
+>&#13;        Here's what this “perfect� weave looks like:
       </P
 ><DIV
 CLASS="informalexample"
@@ -288,6 +303,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1763"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >                    start of full weave
@@ -304,13 +325,16 @@ 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 &#8220;start of
-        full weave&#8221; that every subsequent row is printed.  We
+        too sparse.  It is not until the row marked “start of
+        full weave� that every subsequent row is printed.  We
         can calculate this start position as follows:
       </P
 ><DIV
@@ -320,9 +344,18 @@ CLASS="informalexample"
 ><A
 NAME="AEN1766"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
->start = (S &#8722; 1) × (J &#8722; 1)</PRE
+>start = (S − 1) × (J − 1)</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -341,8 +374,14 @@ CLASS="informalexample"
 NAME="AEN1770"
 ></A
 ><P
->&#13;          S = 2, J = 7, start = (2&#8722;1) × (7&#8722;1) = 6:
+>&#13;          S = 2, J = 7, start = (2−1) × (7−1) = 6:
         </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >        starting row of full weave
@@ -355,6 +394,9 @@ CLASS="screen"
 5                                    *-*-*-*-*-*-*
 6                                           *-*-*-*-*-*-*
 7                                                  *-*-*-*-*-*-*</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -368,6 +410,12 @@ NAME="AEN1773"
 ><P
 >&#13;          S = 7, J = 2, start = 6:
         </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >        start
@@ -382,6 +430,9 @@ CLASS="screen"
 7               *------*
 8                 *------*
 9                   *------*</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -395,6 +446,12 @@ NAME="AEN1776"
 ><P
 >&#13;          S = 4, J = 13, start = 36:
         </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >                                      start
@@ -405,6 +462,9 @@ CLASS="screen"
 3                                        *---*---*---*---*---*---*---*---*---*--
 4                                                     *---*---*---*---*---*---*-
 5                                                                  *---*---*---*</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -418,6 +478,12 @@ NAME="AEN1779"
 ><P
 >&#13;          S = 13, J = 4, start = 36:
         </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >                                      start
@@ -442,6 +508,9 @@ CLASS="screen"
 17                                                                    *---------
 18                                                                        *-----
 19                                                                            *-</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -455,6 +524,12 @@ NAME="AEN1782"
 ><P
 >&#13;          S = 8, J = 5, start = 28:
         </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >                              start
@@ -475,6 +550,9 @@ CLASS="screen"
 13                                                                 *-------*----
 14                                                                      *-------
 15                                                                           *--</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -488,6 +566,12 @@ NAME="AEN1785"
 ><P
 >&#13;          S = 9, J = 5, start = 32:
         </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >                                  start
@@ -508,6 +592,9 @@ CLASS="screen"
 13                                                                 *--------*---
 14                                                                      *-------
 15                                                                           *--</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -521,6 +608,12 @@ NAME="AEN1788"
 ><P
 >&#13;          S = 6, J = 7, start = 30:
         </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >                                start
@@ -537,6 +630,9 @@ CLASS="screen"
 9                                                                *-----*-----*--
 10                                                                      *-----*-
 11                                                                             *</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -547,7 +643,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN1791"
->6.2.3. Weaving collisions</A
+>Weaving collisions</A
 ></H2
 ><P
 >&#13;        A perfect weave is not possible in all cases.  Let's look at
@@ -563,6 +659,12 @@ NAME="AEN1794"
 ><P
 >&#13;          S = 6, J = 4:
         </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >0 *-----*-----*-----*
@@ -573,6 +675,9 @@ CLASS="screen"
 5             |   ^ | *-^---*-----*-----*
               OUCH!   ^ |   ^
                       |     |</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -589,9 +694,18 @@ 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
+>row(p, j) = (p × J) + (j × S)</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -606,10 +720,19 @@ 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
+>row(0, 2) = (0 × 4) + (2 × 6) = 12
+row(3, 0) = (3 × 4) + (0 × 6) = 12</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -636,6 +759,12 @@ NAME="AEN1806"
 ><P
 >&#13;          S = 6, J = 4:
         </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >0 *-----*-----*-----*
@@ -644,6 +773,9 @@ CLASS="screen"
 3             ^-----^-----*-----*
 4                 ^-----^-----*-----*
 5                     ^-----^-----*-----*</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -654,7 +786,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN1809"
->6.2.4. What makes a &#8220;perfect&#8221; weave?</A
+>What makes a “perfect� weave?</A
 ></H2
 ><P
 >&#13;        So what causes the perfect weave cases to be perfect, and
@@ -743,6 +875,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1836"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="programlisting"
 >unsigned int
@@ -757,6 +895,9 @@ gcd(unsigned int x, unsigned int y)
   }
   return y;
 }</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -768,7 +909,7 @@ CLASS="literal"
         weaving algorithm.
       </P
 ><P
->&#13;        If 0 &#8804; j &#60; J, there should only be a single pair (p, j)
+>&#13;        If 0 ≤ 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).)
@@ -783,6 +924,12 @@ NAME="AEN1841"
 ><P
 >&#13;          S = 8, J = 6, G = 2:
         </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >0 *-------*-------*-------*-------*-------*
@@ -791,6 +938,9 @@ CLASS="screen"
 3                   *-------*-------*-------*-------*-------*
 4                         ^-------^-------^-------*-------*-------*
 5                               ^-------^-------^-------*-------*-------*</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -812,6 +962,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1846"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >0 *-------*-------*       -       -       -
@@ -820,6 +976,9 @@ CLASS="screen"
 3          *-------*-------*       -       -       -
 4             *-------*-------*       -       -       -
 5                *-------*-------*       -       -       -</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -834,6 +993,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1849"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >0 *-------*-------*       -       -       -
@@ -844,6 +1009,9 @@ CLASS="screen"
 5                               *-------*-------*       -       -       -
              ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^
             These rows need filling in.</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -857,19 +1025,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) &#8805; J × S (which will happen when we
+        ×J) ≥ 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
@@ -877,7 +1045,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 &#8722; (J / G) jets of pass p + (S / G).  We will
+        first J − (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
@@ -894,6 +1062,12 @@ 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 *-----*-----*-----*-----*-----*-----*-----*-----*
@@ -904,11 +1078,14 @@ CLASS="screen"
 5                                              ^-----^-----^-----^-----^-----^--
        ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^
             These rows need filling in.</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><P
->&#13;        In this case, the first J &#8722; (J / G) = 9 &#8722; (9 /
+>&#13;        In this case, the first J − (J / G) = 9 − (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.
@@ -923,6 +1100,12 @@ 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 *--------*--------*--------*--------*--------*
@@ -931,6 +1114,9 @@ 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
@@ -967,6 +1153,12 @@ 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
@@ -982,25 +1174,28 @@ 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 &#8220;perfect&#8221; weave
-          pattern to give a correct weave in cases where G &#8800; 1
+>&#13;          The simplest way to modify the “perfect� weave
+          pattern to give a correct weave in cases where G ≠ 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
@@ -1029,7 +1224,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
@@ -1045,6 +1240,12 @@ 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 *-----*-----*-----*-----*-----*-----*-----*-----*
@@ -1060,6 +1261,9 @@ 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
@@ -1073,6 +1277,12 @@ 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 *--------*--------*--------*--------*--------*
@@ -1088,6 +1298,9 @@ CLASS="screen"
 10                                                  \---/     *--------*--------
 11                                               small offset       *--------*--
 12                                                                         *----</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1107,6 +1320,12 @@ 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 *-------*-------*-------*
@@ -1120,6 +1339,9 @@ CLASS="screen"
 8                                 *-------*-------*-------*
 9                                \/   *-------*-------*-------*
                             very small offset!</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1134,6 +1356,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1889"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >subblock number
@@ -1148,6 +1376,9 @@ CLASS="screen"
 1  *
 2   *
 3    *</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1168,10 +1399,19 @@ 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
@@ -1185,6 +1425,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1896"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >0123456789
@@ -1208,6 +1454,9 @@ CLASS="screen"
 7      *
 8    *
 9  *</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1221,6 +1470,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1899"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >           1
@@ -1247,6 +1502,9 @@ CLASS="screen"
  8      *
  9    *
 10  *</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1263,6 +1521,12 @@ 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 *-----------*-----------*-----------*-----------*-----------*
@@ -1278,6 +1542,9 @@ CLASS="screen"
 10                                                             *-----------*----
 11                                                                   *----------
 12                                                                        *-----</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1289,7 +1556,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
-          &#8220;changes&#8221; are used.  For example, if 8 bells
+          “changes� 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
@@ -1317,6 +1584,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1909"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >passesperblock = S
@@ -1330,6 +1603,9 @@ 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
@@ -1345,6 +1621,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1912"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >subblocksperblock = gcd(S, J)
@@ -1354,6 +1636,9 @@ if subpassblock * 2 &#60; subblocksperblock
 else
   subblockoffset = 2*(subblocksperblock-subpassblock)-1
 startingrow = p * J + subblockoffset</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1367,6 +1652,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1915"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >subblocksperblock = gcd(S, J)
@@ -1378,11 +1669,14 @@ 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 &#8804; j &#60; J, we can use
+>&#13;          Together with the inequality 0 ≤ 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
@@ -1397,11 +1691,20 @@ 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
@@ -1416,6 +1719,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1921"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >offset = r % J
@@ -1426,6 +1735,9 @@ pass--
 offset += J
 }
 jet = offset / S</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1440,6 +1752,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1924"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >G = gcd(S, J)
@@ -1459,6 +1777,9 @@ subblockretreat = floor(pass / passespersubblock) % G
 pass -= subblockretreat * passespersubblock
 pass += subpassblock * passespersubblock
 jet = (r - subblockoffset - pass * J) / S</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1478,6 +1799,12 @@ 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 *-----*-----*-----*
@@ -1500,6 +1827,9 @@ CLASS="screen"
 17                                                                     *-----*--
 18                                                                        *-----
 19                                                                            *-</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1515,6 +1845,12 @@ 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 *-------*-------*-------*-------*-------*
@@ -1530,6 +1866,9 @@ CLASS="screen"
 10                                                            *-------*-------*-
 11                                                                  *-------*---
 12                                                                         *----</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1545,6 +1884,12 @@ 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 *-----*-----*-----*-----*-----*-----*-----*-----*-----*-----*-----*
@@ -1554,6 +1899,9 @@ CLASS="screen"
 4                                                    *-----*-----*-----*-----*--
 5                                                              *-----*-----*----
 6                                                                         *-----</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1572,7 +1920,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN1937"
->6.2.5. Oversampling</A
+>Oversampling</A
 ></H2
 ><P
 >&#13;        By oversampling, we mean printing on the same row more than
@@ -1589,7 +1937,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 &#8220;drop spacing&#8221; by only accepting
+        enforces this “drop spacing� 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
@@ -1600,18 +1948,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 (&#8220;lines&#8221;) and printing each line on
+        sets of dots (“lines�) 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 &#8220;horizontal
-        oversampling&#8221;) while O shows how many times we want to
+        offsets we want to print at (the “horizontal
+        oversampling�) while O shows how many times we want to
         print each row, over and above the number of times necessary
-        for horizontal oversampling (the &#8220;extra
-        oversampling&#8221;).
+        for horizontal oversampling (the “extra
+        oversampling�).
       </P
 ><P
 >&#13;        It is necessary for all the lines printed by a given pass to
@@ -1629,10 +1977,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 &#8220;band&#8221;.  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 “band�.  Printing one band
+        involves advancing the paper S×J rows, as a pass
         block did before.
       </P
 ><P
@@ -1654,6 +2002,12 @@ 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 *---*---*---*---*---*---*---*---*---*
@@ -1672,6 +2026,9 @@ CLASS="screen"
 13                                                                 *---*---*---*
 14                                                                      *---*---
 15                                                                           *--</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1683,7 +2040,7 @@ CLASS="screen"
 CLASS="computeroutput"
 >*</SAMP
 >s
-        with integers in the range [0&#8230;H&#8722;1].
+        with integers in the range [0…H−1].
       </P
 ><P
 >&#13;        Overprinting occurs once per pass block, so we can simply
@@ -1698,6 +2055,12 @@ 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
@@ -1716,6 +2079,9 @@ CLASS="screen"
 13                                                                 1---1---1---1
 14                                                                      1---1---
 15                                                                           1--</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1732,6 +2098,12 @@ 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
@@ -1747,6 +2119,9 @@ CLASS="screen"
 10                                                             0---0---0---0---0
 11                                                                   0---0---0--
 12                                                                        1---1-</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1770,6 +2145,12 @@ 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:
@@ -1790,6 +2171,9 @@ Band 1:
 12                                                                1---1---1---1-
 13                                                                     1---1---1
 14                                                                          1---</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1804,6 +2188,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1962"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >A = floor(J / H)
@@ -1817,6 +2207,9 @@ 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
@@ -1829,6 +2222,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1965"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >A = floor(J / H)
@@ -1845,8 +2244,11 @@ 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&#8230;
+>&#13;            To be continued…
           </P
 ><P
 ></P
@@ -1880,7 +2282,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/x271.html b/doc/developer/reference-html/x271.html
index 9337d74..6be31a9 100644
--- a/doc/developer/reference-html/x271.html
+++ b/doc/developer/reference-html/x271.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="UP"
 TITLE="Adding a new printer"
 HREF="c200.html"><LINK
@@ -17,14 +17,11 @@ TITLE="Adding a new printer"
 HREF="c200.html"><LINK
 REL="NEXT"
 TITLE="ESC/P2"
-HREF="c464.html"></HEAD
+HREF="c464.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="sect1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -74,7 +71,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN271"
->4.2. The driver file</A
+>The driver file</A
 ></H1
 ><P
 >&#13;      Adding a new printer to a driver module
@@ -115,7 +112,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&#8212;the communication protocol doesn't really
+      information—the communication protocol doesn't really
       contain very much IP, so they have less reason to keep it
       secret.
     </P
@@ -128,7 +125,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN281"
->4.2.1. Epson inkjet printers</A
+>Epson inkjet printers</A
 ></H2
 ><P
 >&#13;        The <CODE
@@ -167,6 +164,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN291"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="programlisting"
 >typedef struct escp2_printer
@@ -242,6 +245,9 @@ const double *hue_adjustment;
 const double *sat_adjustment;
 const paperlist_t *paperlist;
 } escp2_printer_t;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -477,14 +483,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 &#8220;microweave&#8221;) and
-        &#8220;soft&#8221; weaving (the driver determines the exact
+        incorrectly referred to as “microweave�) and
+        “soft� 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
-        &#8220;microweave&#8221; for historical reasons.
+        “microweave� for historical reasons.
       </P
 ><P
 >&#13;        For the dot sizes, the value for each element in the vector
@@ -581,28 +587,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&#8230;
+        720×720, because if it did the output would be very
+        smooth.  Perhaps it's possible to tweak things…
       </P
 ><P
 >&#13;        The list of densities is a list of base density values for all
-        of the above listed modes.  &#8220;Density&#8221; refers to
+        of the above listed modes.  “Density� 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.  &#8220;Base density&#8221; refers to
+        half the possible dots.  “Base density� 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
@@ -626,8 +632,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
@@ -645,7 +651,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
-        &#8220;value&#8221; of ink for each available dot size, where
+        “value� of ink for each available dot size, where
         the largest dot size has a value of <CODE
 CLASS="constant"
 >1</CODE
@@ -804,7 +810,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN403"
->4.2.2. Tuning the printer</A
+>Tuning the printer</A
 ></H2
 ><P
 >&#13;        Now, how do you use all this to tune a printer?  There are a
@@ -977,7 +983,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
@@ -1000,7 +1006,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN433"
->4.2.3. Canon inkjet printers</A
+>Canon inkjet printers</A
 ></H2
 ><P
 >&#13;        Basically, a new Canon printer can be added to
@@ -1012,8 +1018,8 @@ CLASS="filename"
         differences are noted here.
       </P
 ><P
->&#13;        In general, Canon printers have more &#8220;built-in
-        intelligence&#8220; than Epson printers which results in the
+>&#13;        In general, Canon printers have more “built-in
+        intelligence“ 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
@@ -1032,6 +1038,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN440"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="programlisting"
 >typedef struct canon_caps {
@@ -1053,6 +1065,9 @@ 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
@@ -1060,11 +1075,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"
@@ -1128,6 +1143,12 @@ 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[] =
@@ -1143,6 +1164,9 @@ CLASS="programlisting"
   &#38;ci_CMYK_3, &#38;ci_CMYK_3, &#38;ci_CMYK_3,
 },
 };</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1188,7 +1212,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/x67.html b/doc/developer/reference-html/x67.html
index 425a70b..9130f98 100644
--- a/doc/developer/reference-html/x67.html
+++ b/doc/developer/reference-html/x67.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="UP"
 TITLE="Using libgutenprint"
 HREF="c48.html"><LINK
@@ -17,14 +17,11 @@ TITLE="Using libgutenprint"
 HREF="c48.html"><LINK
 REL="NEXT"
 TITLE="Integrating libgutenprint"
-HREF="x79.html"></HEAD
+HREF="x79.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="sect1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -74,7 +71,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN67"
->2.2. Linking with libgutenprint</A
+>Linking with libgutenprint</A
 ></H1
 ><P
 >&#13;      To link a program with libgutenprint, the option
@@ -89,6 +86,12 @@ CLASS="filename"
 > the following commands would be
       used:
     </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 ><SAMP
@@ -105,6 +108,9 @@ 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
@@ -140,7 +146,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/x79.html b/doc/developer/reference-html/x79.html
index ac4968b..05f0608 100644
--- a/doc/developer/reference-html/x79.html
+++ b/doc/developer/reference-html/x79.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="UP"
 TITLE="Using libgutenprint"
 HREF="c48.html"><LINK
@@ -17,14 +17,11 @@ TITLE="Linking with libgutenprint"
 HREF="x67.html"><LINK
 REL="NEXT"
 TITLE="Reporting Bugs"
-HREF="c194.html"></HEAD
+HREF="c194.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="sect1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -74,7 +71,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN79"
->2.3. Integrating libgutenprint</A
+>Integrating libgutenprint</A
 ></H1
 ><P
 >&#13;      This section describes how to integrate the compiling and
@@ -102,7 +99,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN86"
->2.3.1. <B
+><B
 CLASS="command"
 >pkg-config</B
 ></A
@@ -152,6 +149,12 @@ CLASS="option"
 >--cflags</CODE
 > option:
       </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 ><SAMP
@@ -162,6 +165,9 @@ CLASS="userinput"
 >pkg-config --cflags gutenprint</KBD
 >
 -I/usr/local/include</PRE
+></TD
+></TR
+></TABLE
 ><P
 >&#13;	The correct <CODE
 CLASS="varname"
@@ -172,6 +178,12 @@ CLASS="option"
 >--libs</CODE
 > option:
       </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 ><SAMP
@@ -182,6 +194,9 @@ 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
 	<CODE
@@ -189,6 +204,12 @@ CLASS="varname"
 >--version</CODE
 > option:
       </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 ><SAMP
@@ -199,10 +220,19 @@ 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 &#8216;`&#8217;:
+	backquotes ‘`’:
       </P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 ><SAMP
@@ -220,6 +250,9 @@ 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
@@ -238,7 +271,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN123"
->2.3.2. <B
+><B
 CLASS="command"
 >make</B
 ></A
@@ -259,11 +292,20 @@ 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
@@ -279,7 +321,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN133"
->2.3.3. <B
+><B
 CLASS="command"
 >autoconf</B
 ></A
@@ -305,7 +347,7 @@ CLASS="filename"
 CLASS="command"
 >autoconf</B
 > expands
-	the m4 macros into &#8216;real&#8217; shell script.  The
+	the m4 macros into ‘real’ shell script.  The
 	resulting <B
 CLASS="command"
 >configure</B
@@ -342,9 +384,18 @@ 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
@@ -355,7 +406,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN150"
->2.3.4. <B
+><B
 CLASS="command"
 >automake</B
 ></A
@@ -515,6 +566,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN189"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="programlisting"
 >@SET_MAKE@
@@ -526,6 +583,9 @@ stpimage_SOURCES = stpimage.c
 stpimage_LDADD = $(GUTENPRINT_LIBS)
 
 MAINTAINERCLEANFILES = Makefile.in</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -567,7 +627,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/x955.html b/doc/developer/reference-html/x955.html
index bc3f395..cd11971 100644
--- a/doc/developer/reference-html/x955.html
+++ b/doc/developer/reference-html/x955.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
@@ -8,7 +8,7 @@ NAME="GENERATOR"
 CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="index.html"><LINK
+HREF="book1.html"><LINK
 REL="UP"
 TITLE="ESC/P2"
 HREF="c464.html"><LINK
@@ -17,14 +17,11 @@ TITLE="ESC/P2"
 HREF="c464.html"><LINK
 REL="NEXT"
 TITLE="Appropriate Remote Commands"
-HREF="x1669.html"></HEAD
+HREF="x1669.html"><META
+http-equiv="Content-Type"
+content="text/html; charset=UTF-8"></HEAD
 ><BODY
 CLASS="sect1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -74,7 +71,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN955"
->5.2. Remote Mode Commands</A
+>Remote Mode Commands</A
 ></H1
 ><P
 >&#13;    The following description of remote commands comes out of an
@@ -96,9 +93,18 @@ 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
@@ -113,9 +119,18 @@ 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
@@ -187,8 +202,8 @@ CLASS="varname"
 ></DT
 ><DD
 ><P
->&#13;          On my 740, prints the following, probably &#8220;version
-          information&#8221;:
+>&#13;          On my 740, prints the following, probably “version
+          information�:
         </P
 ><DIV
 CLASS="informalexample"
@@ -197,9 +212,18 @@ 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
@@ -214,7 +238,7 @@ CLASS="varname"
 ></DT
 ><DD
 ><P
->&#13;          Prints a &#8220;printer ID&#8221;.  On one 870, prints the
+>&#13;          Prints a “printer ID�.  On one 870, prints the
           following:
         </P
 ><DIV
@@ -224,9 +248,18 @@ 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
@@ -488,9 +521,18 @@ 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
@@ -504,9 +546,18 @@ 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
@@ -660,7 +711,7 @@ CLASS="varname"
 CLASS="constant"
 >00</CODE
 > selects
-            the &#8220;Feed paper sequence setting&#8221;.
+            the “Feed paper sequence setting�.
             <CODE
 CLASS="varname"
 >yy</CODE
@@ -844,9 +895,9 @@ CLASS="constant"
 CLASS="constant"
 >1</CODE
 > is
-            used when printing on &#8220;plain paper&#8221;,
-            &#8220;360dpi ink jet paper&#8221; or &#8220;ink jet
-            transparencies&#8221;, and
+            used when printing on “plain paper�,
+            “360dpi ink jet paper� or “ink jet
+            transparencies�, and
             <CODE
 CLASS="varname"
 >yy</CODE
@@ -944,8 +995,8 @@ CLASS="constant"
             paper.  <CODE
 CLASS="varname"
 >yy</CODE
-> selects &#8220;paper path
-            number&#8221;.
+> selects “paper path
+            number�.
           </P
 ></DD
 ><DT
@@ -1017,7 +1068,7 @@ CLASS="varname"
 CLASS="constant"
 >00</CODE
 > sets the
-            drying time &#8220;per scan&#8221; (per pass?);
+            drying time “per scan� (per pass?);
             <CODE
 CLASS="varname"
 >xx</CODE
@@ -1219,9 +1270,9 @@ CLASS="varname"
 CLASS="constant"
 >0x10</CODE
 > (1.6 mm).  If 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
+            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
             platen gap is set high irrespective of the
             <TT
 CLASS="literal"
@@ -1269,8 +1320,8 @@ CLASS="varname"
             <TT
 CLASS="literal"
 >ST</TT
-> command as &#8220;Set printer
-            state reply&#8221;.  If <CODE
+> command as “Set printer
+            state reply�.  If <CODE
 CLASS="varname"
 >xx</CODE
 > is
@@ -1306,6 +1357,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN1341"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >@BDC ST\r
@@ -1318,6 +1375,9 @@ AI:CW:02kkccmmyy, MI:mm
 [TC:tttt;]
 INK:...;
 \f</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1705,7 +1765,7 @@ CLASS="constant"
 ></TD
 ><TD
 >&#13;                    Black ink low (Photo black on printers using
-                    UltraChrome® ink)
+                    UltraChrome® ink)
                   </TD
 ></TR
 ><TR
@@ -1879,12 +1939,21 @@ CLASS="informalexample"
 ><A
 NAME="AEN1556"
 ></A
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
 ><PRE
 CLASS="screen"
 >@BDC PS\r\nST:<CODE
 CLASS="varname"
 >xx</CODE
 >;\f</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
@@ -1943,9 +2012,18 @@ 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
@@ -1986,7 +2064,7 @@ CLASS="varname"
             <CODE
 CLASS="varname"
 >y</CODE
->[1] &#8230;
+>[1] …
             <CODE
 CLASS="varname"
 >y</CODE
@@ -2255,7 +2333,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="index.html"
+HREF="book1.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/gutenprint-options b/doc/gutenprint-options
new file mode 100644
index 0000000..b40401c
--- /dev/null
+++ b/doc/gutenprint-options
@@ -0,0 +1,935 @@
+Basic Printer Options
+
+    These options control basic printer functions.
+
+        Printer Model
+
+                Select the printer to use.  It must be supplied in all
+                cases.
+
+        Page Size
+
+                Select the paper (media) size to print to.  Some
+                printers support custom paper sizes, while others only
+                support certain preset sizes.
+
+                Note that this option refers to the actual size of the
+                media, not the printable area.  For example, selecting
+                A4 refers to actual A4 paper, whatever the margins may
+                be.
+
+        Double-Sided Printing
+
+                Otherwise known as "duplex" printing, this is offered
+                for printers capable of printing on both sides of the
+                page.  In addition to single-sided printing, there are
+                two modes of duplex operation: the page may be flipped
+                over its long edge (like a book), or over the short
+                edge (like a note pad; this is sometimes referred to
+                as Tumble).
+
+        Media Type
+
+                Select the kind of paper or other media being printed
+                to.  This enables the printer and driver to be set up
+                appropriately for the kind of paper in use.
+
+                It is important to set the Media Type to the correct
+                value if possible, or if not to a closely related
+                medium.  The printer may need to know what kind of
+                media is in use to determine how to feed the paper
+                correctly; the driver needs to know in order to select
+                the right output settings.
+
+        Media Source
+
+                Select the source of the paper or other media.  This
+                option is offered with printers that have multiple
+                feeds, for example multiple paper bins, manual feed,
+                printing directly to a CD, etc.
+
+        Ink Set
+
+                Select the kind of ink in use in the printer, for
+                printers offering different optional inks (for
+                example, ink designed for matte paper vs. ink designed
+                for glossy paper).
+
+        Borderless
+
+                Select whether to print with borders or not, for
+                printers with the capability to overprint the page.
+                This is otherwise known as "full bleed".
+
+        Enhanced Gloss
+
+                Some newer printers have a cartridge of "gloss
+                enhancer", which helps solve the problem of pigment
+                inks having an inconsistent "luster" on glossy paper.
+                Use this option to enable use of the gloss enhancer.
+
+
+Advanced Printer Options
+
+    These options control more advanced printer-specific behaviors.
+    Generally it's not necessary to adjust these options.
+
+        Resolution
+
+                Select the resolution to print at (dots per inch).  In
+                general, higher resolutions produce better quality, at
+                the expense of additional time.
+
+                As a general rule of thumb, on laser printers and
+                older inkjet printers resolutions of 300 DPI or
+                thereabouts provide draft quality; lower resolutions
+                provide economy draft quality and cannot produce solid
+                black.  Resolutions of 600 or 720 DPI produce good
+                quality output; higher resolutions are useful for very
+                high quality image or graphic output.  Newer inkjet
+                printers, with smaller ink drop sizes, typically
+                require higher resolutions to produce acceptable
+                output; in some cases even 1440x720 DPI does not
+                produce good quality.
+
+                Users of Epson inkjet printers have another setting
+                available: the Quality option can be used to
+                indirectly control the printer resolution, among other
+                things.  This offers a simpler way to control output
+                quality.
+
+        Ink Type
+
+                Select which subset of inks to use for printing.  For
+                example, on a photo printer with additional light cyan
+                and light magenta inks, it's possible to print with
+                only the standard cyan, magenta, yellow, and black
+                inks.
+
+                Normally there is no reason to use any setting other
+                than the default.  Reasons why one might want to use
+                it include:
+
+                1) Some black inks are not compatible with certain
+                   glossy papers.  If the black ink smudges on your
+                   paper, you may elect to use an option without black
+                   ink (a "composite" setting).
+
+                2) Some inks or paper/ink combinations produce color
+                   shifts when the light inks are used.  If your
+                   chosen combination produces unacceptable color
+                   shifts or color casts, you may prefer to use the
+                   Four Color Standard option, which will generally
+                   yield more consistent color at the expense of
+                   "grainier" output.
+
+        Printing Direction
+
+                Most inkjet printers can print either unidirectionally
+                (the head prints only when moving in one direction) or
+                bidirectionally (the head prints when moving in both
+                directions).  Bidirectional printing is generally
+                faster, since the printer is printing at all times
+                rather than wasting much of the time returning the
+                head to the starting position.  On many printers,
+                however, unidirectional printing produces better
+                quality output than bidirectional printing.
+
+                The standard setting for this option adapts to the
+                printing resolution.
+
+        Laminate Pattern
+
+                Some dye sublimation printers are able achieve better
+                durability of output by covering it with transparent
+                laminate surface. This surface can be of different
+                patterns: common are matte, glossy or texture.
+
+
+Specialized Printer Options
+
+    These options control unusual printer features.  They may be
+    useful in certain circumstances.
+
+        CD Hub Size
+
+                This setting may be used on printers with the
+                capability to print directly to a CD.  Depending upon
+                your choice of media, you may be able to safely print
+                all the way to the inner hole of the CD, or you may
+                not be able to print any closer than the hub about an
+                inch from the center.
+
+        CD Horizontal Fine Adjustment
+        CD Vertical Fine Adjustment
+
+                These settings allow you to shift the position of the
+                print while printing to a CD.  If you find that your
+                print is not centered on the CD surface, you may need
+                to adjust these setting to compensate.
+
+        Interleave Method
+
+                Most inkjet printers create the printed image using
+                multiple overlapping passes of the print head.  On
+                many printers this function is performed within the
+                printer itself and cannot be adjusted, but with many
+                Epson inkjet printers (and some others), this is
+                performed by the driver or may be specified to the
+                printer.  One advantage of the multiple overlapping
+                passes is that it can hide small differences between
+                the individual print head nozzles, which would
+                otherwise be visible as banding.  The different
+                interleave methods are different strategies for
+                for performing this overlapping; some are better at
+                hiding the banding than others.  They all require the
+                same amount of time to print.
+
+                Generally it is not necessary to adjust this; in some
+                cases, depending upon your printer, you may find that
+                one pattern or another performs better.
+
+                On Epson Stylus Pro printers, this option allows
+                specifying different overlap patterns within the
+                printer.  In this case, the choice of overlap pattern
+                may affect both the printing time and the quality to a
+                significant degree.
+
+        Adjust dot size as necessary
+
+                This option is provided on many Epson inkjet printers
+                to allow you to use larger ink drops than those
+                normally used for the resolution chosen.  This may be
+                necessary if you use certain kinds of media or for
+                some reason wish to use much more ink (higher density)
+                than the default.  It should not be necessary to use
+                this option.
+
+
+Basic Output Controls
+
+        Output Type
+
+                This option specifies whether to print in color or
+                black and white/grayscale (using only black inks).
+                Black and white printing is generally faster than
+                color printing, even if the item being printed is
+                entirely black and white.  However, printing with only
+                black ink may yield a "grainy" appearance.
+
+        Color Correction
+
+                This selects the choice of color correction method
+                within Gutenprint.  The following options are offered:
+
+                * DEFAULT: Select a color correction mode appropriate
+                  for the document type being printed.
+
+                * HIGH ACCURACY: Apply optimum color correction to the
+                  output to produce the best color quality.  This
+                  corrects the hue, brightness, and saturation
+                  (brilliance of color).  This is the normal setting
+                  to use for printing photographs or graphics if you
+                  are not using any external color management.
+
+                * BRIGHT COLORS: Apply color correction to the output,
+                  but generate more brilliant colors in some cases.
+
+                * CORRECT HUE ONLY: Apply color correction to the
+                  output, but correct only the hue.  This option does
+                  not correct brightness and saturation.
+
+                * UNCORRECTED: Do not apply any color correction to
+                  the output beyond generating linear output.  This is
+                  the best setting to use when utilizing external
+                  color management; the high accuracy modes employ
+                  correction algorithms that may not work well with
+                  color management.
+
+                  Note that if you use color management you should use
+                  profiles created with Gutenprint and with the exact
+                  settings that you plan to print with.  Profiles
+                  provided by the printer vendor are calibrated for
+                  the vendor's driver, which may not be identical to
+                  Gutenprint's calibration.
+
+                * DESATURATED: Print in pure grayscale, but using
+                  color inks.  The result is somewhat different from
+                  printing in black and white using the Output Type
+                  option -- the driver may use color ink, which
+                  generates smoother output and may yield better
+                  results on many papers.
+
+                * THRESHOLD: Convert all colors to fully on or fully
+                  off, eliminating all gradual tonal gradations.  The
+                  result is that the output will consist of all very
+                  pure colors.
+
+                * DENSITY: Correct only the amount of ink ("density"),
+                  otherwise performing no correction at all, even for
+                  linearity.  Prints made with this option will
+                  usually be very dark if no other color management is
+                  used.  This may be useful if you are printing in 16
+                  bit precision or are using your own linearization
+                  curves.
+
+                * RAW: Perform no correction at all, even for
+                  density.  Prints made with this option will be very
+                  dark and may bleed (or even puddle!) ink if not used
+                  with external color management and linearization.
+                  This option may be useful if you are using external
+                  color management and linearization to get extremely
+                  saturated dark colors by using more ink in
+                  individual channels.  It should be used with extreme
+                  caution, as it is very easy to damage the printer if
+                  you are not careful.
+
+                * PRE-DITHERED: Interpret each pixel as the actual
+                  size of each drop to be printed.  Legal values of
+                  the drop sizes differ between printers; all printers
+                  support 0 (no droplet) and 1 (the largest droplet).
+                  Some printers support four levels (0, 1, 2, and 3).
+
+        Image Type
+
+                Specify the option that best describes your print job.
+                Your choice here will affect the processing of the
+                print job.  Currently available settings are:
+
+                * TEXT: Optimize the output for printing black text
+                  with no graphics.  This option results in crisp
+                  output and is very fast, but will yield very poor
+                  results with any color or grayscale graphics.
+
+                * GRAPHICS: Optimize the output for printing color
+                  graphics.  This option will generate smooth, bright
+                  output.
+
+                * MIXED TEXT AND GRAPHICS: Optimize the output for
+                  printing a mixture of text and graphics.
+
+                * PHOTOGRAPH: Optimize the output for printing
+                  photographs.  This option will generate smooth
+                  tones and high quality colors, but will be slower
+                  than the other options.
+
+                * LINE ART: Optimize the output for printing black and
+                  white line art with intricate detail.
+
+                * MANUAL CONTROL: Do not bias the output at all; use
+                  only the settings specified by the user.
+
+        Print Quality
+
+                Specify the desired output quality using convenient
+                presets.  Where this option is available, Gutenprint
+                will automatically adjust the printing resolution and
+                other options to generate the desired quality.
+                Settings chosen with this option may be overridden by
+                explicitly setting other settings, such as resolution.
+                Not all printers offer all of these options.
+                Currently available settings, in increasing order of
+                quality, include:
+
+                * FAST ECONOMY: Use the fastest printing mode
+                  available on the printer to print with a minimum
+                  amount of ink.  This option will produce very washed
+                  out colors and grays, and will typically be
+                  extremely grainy and streaky.
+
+                * ECONOMY: Print very rapidly with a reduced amount of
+                  ink.  This option will produce washed out colors and
+                  grays and will typically be quite grainy and
+                  streaky.
+
+                * DRAFT: Print low quality draft output quickly.  This
+                  option will typically produce acceptable colors with
+                  some amount of grain on plain paper, but will
+                  typically produce washed out and grainy output on
+                  high quality papers.  On some printers this may
+                  employ a special draft mode to print especially
+                  quickly at the expense of color fidelity.
+
+                * STANDARD: Print at a normal quality level for text
+                  or text/graphics on plain paper or basic inkjet
+                  paper.  This option will typically produce
+                  acceptable colors, but on high quality papers the
+                  output may be grainy or somewhat washed out.  This
+                  option may also be useful for printing draft copies
+                  of photographs on coated inkjet paper.
+
+                * HIGH: Print final copies of text or text/graphics on
+                  plain paper or inkjet paper.  This option will
+                  typically produce good color quality, but the
+                  quality may not be optimal for photographs on glossy
+                  paper.  This option may also be useful for printing
+                  draft copies of photographs on glossy paper.
+
+                * PHOTO: Print photographs on glossy paper or very
+                  high quality text, text/graphics, or line art on
+                  high quality paper.  In the latter application this
+                  will produce output close to laser printer quality.
+                  On the highest quality premium papers the result may
+                  still be a bit grainy.
+
+                * SUPER PHOTO: Print photographs on glossy paper with
+                  very high quality.  This will generally yield very
+                  good results on high quality premium paper but may
+                  be overkill on other papers.  This option is only
+                  offered on printers capable of producing very high
+                  quality output rivaling traditional photographic
+                  printing.  This option may also be appropriate for
+                  very intricate line art, where the required
+                  resolution may exceed the capabilities of laser
+                  printers.
+
+                * ULTRA PHOTO: Print photographs on premium papers
+                  with extremely high quality.  This option is only
+                  offered on printers capable of producing extremely
+                  high quality output matching or exceeding
+                  traditional photographic printing.
+
+                * BEST: Print with the best quality available on the
+                  printer for the application chosen.  This may be
+                  equivalent to one of the other settings; on a very
+                  few printers the resolution may exceed that of Ultra
+                  Photo mode.
+
+                * MANUAL CONTROL: Do not adjust the settings at all;
+                  use only the settings specified by the user.
+
+
+Basic Output Adjustments
+
+        Saturation
+
+                This option controls the vividness of the output
+                color; higher values produce more vivid colors.  Very
+                low values produce muted colors; setting this to zero
+                produces gray.
+
+        Contrast
+
+                This controls the contrast of the output.  Lower
+                values produce less tonal range in the midtones
+                (lighter colors become darker, and darker colors
+                become lighter), which may allow for more definition
+                in the highlights and shadows.  Higher values do the
+                opposite: lighter colors become even lighter, while
+                darker colors become even darker.
+
+        Brightness
+
+                This control adjusts the general brightness of the
+                print; higher values produce generally lighter output,
+                while lower values produce generally darker output.
+                White and black are not changed; colors also retain
+                their hue and saturation.
+
+
+Advanced Output Adjustments
+
+    These controls adjust more specialized settings.
+
+        Dither Algorithm
+
+                Since inkjet printers have a very limited set of ink
+                colours, most colours have to be produced by mixing
+                the available inks.  This is done by printing patterns
+                of very small dots, fooling the eye into seeing many
+                different shades.  This process is called "dithering";
+                several different patterns are available, with
+                trade-offs between speed and quality.  The following
+                dither algorithms are currently available.  If no
+                algorithm is selected, the package chooses an
+                appropriate one based on other option settings.  The
+                following algorithms are currently available,
+                generally in increasing order of quality.
+
+                * VERY FAST: This algorithm produces very rough,
+                  patterned output, but is extremely fast.  This
+                  generally yields poor results on modern inkjet
+                  printers, particularly models that offer multiple
+                  drop sizes, but it can yield very good results on
+                  laser printers.  It is a good choice for printing
+                  text or line art where no grayscale or color is
+                  used, and also works very well when Threshold color
+                  correction is used.
+
+                * FAST: This algorithm also produces output with very
+                  strong diagonal patterns.  It is also quite fast.
+                  It produces somewhat better results on modern inkjet
+                  printers that offer multiple drop sizes, but offers
+                  no advantages on laser printers or old (generally
+                  pre-1999) inkjet printers.
+
+                * ORDERED: This algorithm produces much smoother
+                  output than Fast or Very Fast.  It is somewhat
+                  slower than those algorithms.  It utilizes a fixed
+                  pattern that is generally free of artifacts.  It is
+                  an excellent choice for printing draft copies of
+                  business graphics or photographs (charts, etc.) due
+                  to its lack of artifacts.
+
+                * ADAPTIVE HYBRID: This algorithm produces slightly
+                  smoother output than Ordered dithering, at some cost
+                  in performance.  It uses a fixed pattern in
+                  highlights to avoid artifacts, and error diffusion
+                  at higher densities to reduce noise (which looks
+                  like roughness in texture).  It is an excellent
+                  choice for printing business graphics due to its
+                  lack of artifacts and smooth texture in darker
+                  tones.
+
+                * EVEN TONE: This relatively new algorithm yields
+                  excellent smoothness in all tones (light, midtone,
+                  and shadow), but is considerably slower than most of
+                  the other algorithms.  It is somewhat prone to
+                  artifacts, including "tearing", at sharp boundaries.
+                  This algorithm is well-suited for printing
+                  photographs, but is not as suitable for printing
+                  solid-tone graphics.
+
+                * HYBRID EVEN TONE: This algorithm combines Even Tone
+                  and Ordered dithering to yield smooth results with
+                  fewer artifacts than Even Tone dithering, but is
+                  even slower than standard Even Tone.  It uses the
+                  fixed pattern of Ordered dithering to break up the
+                  artifacts of Even Tone dithering.  The result is not
+                  quite as smooth as pure Even Tone, but the reduction
+                  of artifacts makes this an excellent choice for
+                  photographs or photographs mixed with other
+                  graphics.
+
+                * PREDITHERED: This is used in combination with
+                  dithering performed outside of Gutenprint or with
+                  printers that perform their own dithering.  It
+                  assumes that the output is already dithered and
+                  generates the appropriate drops based only on the
+                  values provided.
+
+        Linear Contrast Adjustment
+
+                The standard contrast control does not adjust the
+                black and white points of the output; black in the
+                input becomes black in the output, for example.  The
+                result is that if contrast is reduced below 1, the
+                contrast in the highlights and shadows is actually
+                increased to keep the same total tonal range.
+
+                Gimp-Print 4.2 used a different kind of contrast
+                control.  In Gimp-Print 4.2, reducing the contrast
+                reduced the contrast throughout the tonal range,
+                resulting in white being printed as a light gray and
+                black as a dark gray (reducing the contrast all the
+                way to zero resulted in a uniform gray).  If contrast
+                was increased, the contrast was stretched until the
+                output reached either black or white; anything lighter
+                always printed as white and anything darker as black.
+
+                Turning this control on selects the old Gimp-Print 4.2
+                behavior.  This control is normally turned off.
+
+
+Output Density Controls
+
+    These controls adjust the amount of ink printed on the page.
+    These controls may be used to darken a solid, pure black, or
+    eliminate puddling (wet ink left on the paper that does not dry in
+    the printer) if needed.  They may also be useful for adjusting the
+    behavior of non-standard inks.  They should not be used to lighten
+    or darken the print if the black level is correct.
+
+    These controls are adjustments -- they adjust the amount of ink
+    relative to the amount selected by the driver for the paper and
+    resolution chosen.
+
+        Density Value
+
+                This control adjusts the total amount of ink used in
+                all channels (ink colors).
+
+        Black Density Value
+        Blue Density Value
+        Cyan Density Value
+        Magenta Density Value
+        Yellow Density Value
+        Red Density Value
+
+                These controls adjust the amount of ink used by each
+                channel separately.  They may be used to correct the
+                amount of ink if needed to strengthen or weaken
+                particular colors (e. g. if yellow is too strong or
+                too weak).  They should not be used to correct gray
+                balance (to produce neutral gray) -- the gray balance
+                controls described below should be used for that
+                purpose.
+
+        Ink Limit Value
+
+                This control adjusts the maximum amount of ink that
+                the driver will use to print with.  This may be used
+                if you want to use large amounts of particular inks to
+                achieve saturated dark colors, without using excessive
+                ink overall that will result in ink puddling or
+                spilling within the printer.  This control should be
+                used only by people very experienced in inkjet
+                printing.
+
+
+Gray Balance Controls
+
+    These controls adjust the gray balance by changing the amount of
+    each color of ink used to produce gray.  For example, if gray
+    prints somewhat greenish, it can be corrected by increasing the
+    magenta balance.
+
+        Magenta Balance Value
+        Yellow Balance Value
+        Cyan Balance Value
+
+
+Output Gamma Controls
+
+    These controls permit adjusting the gamma (exponent) of the
+    transfer curves of the individual channels.  On most printers,
+    using a linear ink scale (that is, the amount of ink is directly
+    proportional to the input value) will produce very dark
+    highlights, as even quite small amounts of ink produce very strong
+    colors or gray.  Therefore, the driver uses less ink to produce
+    lighter colors.  This does not affect the darkest tones.
+
+    Setting these controls to larger values results in lighter
+    highlights and midtones.  These controls are adjustments -- they
+    adjust the gamma relative to the gamma chosen by the driver by
+    multiplying them together.  For example, if the driver uses a
+    gamma value of 2.0 for a particular printer, and you specify a
+    gamma of 0.75, the actual gamma used to print will be 1.5.
+
+        Composite Gamma Value
+
+                This control adjusts the gamma of all available ink
+                channels when printing in color.
+
+        Black Gamma Value
+
+                This control adjusts the gamma of the black channel
+                when printing in grayscale.
+
+        Magenta Gamma Value
+        Yellow Gamma Value
+        Cyan Gamma Value
+
+                These controls adjust the gamma of individual channels
+                when printing on printers that use cyan, magenta, and
+                yellow inks (all inkjet printers use CMY inks).  These
+                gamma values are multiplied by the composite gamma
+                value and the gamma chosen by the driver.
+
+                Note that the black gamma value is not used when
+                printing in color.  That is because the amount of gray
+                is computed after the gamma transformation has been
+                applied to each channel, and the black channel is
+                synthesized from this value.  The GCR Transition Value
+                serves as a gamma value for the black channel.  In
+                addition, there are no gamma values for the special
+                channels for printers that offer additional inks (such
+                as red and blue) for similar reasons.
+
+        Red Gamma Value
+        Green Gamma Value
+        Blue Gamma Value
+
+                These controls adjust the gamma of individual channels
+                when printing on printers that use red, green, and
+                blue inks (Postscript printers and many dye
+                sublimation printers use red, green, and blue colors).
+                These gamma values are multiplied by the composite
+                gamma value and the gamma chosen by the driver.
+
+
+Gray Generation Controls
+
+    These controls adjust the conversion of gray into black ink and
+    composite (CMY) components.  When printing in color, light grays
+    are often printed using composite inks rather than black ink to
+    reduce the speckling effect of dark black dots, while dark grays
+    and black are usually printed using black ink to achieve a darker
+    black.  With some ink and paper combinations it is necessary to
+    use a mixture of black and composite components to achieve maximum
+    density and in some cases to achieve neutral grays (some pigment
+    black inks are actually brown).
+
+    The effect of using too much or too little black ink varies.
+    Typically if too much black ink is used light colors and grays
+    will have noticeable speckling from the black drops, while if too
+    little black ink is used the midtones and dark tones will be
+    washed out and in some cases too much ink will be used leading to
+    puddles on the page.  In some cases very large amounts of
+    composite ink cause color shifts (darker grays are not neutral).
+    Epson Premium Glossy Photo Paper seems to be particularly prone to
+    this problem, particularly with dye inks.
+
+    In general, lower-quality papers require more black ink (composite
+    inks generally cannot create very dark tones), while higher
+    quality papers require less black ink (the composite inks can
+    create much darker grays, and the black dots appear much sharper).
+
+    Setting these controls effectively requires a good understanding
+    of gray generation and a fair amount of experimentation.  Normally
+    it's only necessary to set the paper type correctly to get good
+    results.
+
+        GCR Lower Bound Value
+
+                This control specifies the darkest shade of gray at
+                which no black ink will be used (i. e. any lighter
+                gray component will be printed using only composite
+                inks).  Setting this control to zero means that some
+                amount of black ink will always be used; setting it to
+                1 means that no black ink will ever be used.
+
+        GCR Upper Bound Value
+
+                This control specifies the lightest shade of gray at
+                which no composite CMY ink will be used (i. e. this
+                level of gray and higher will be printed using only
+                black ink).  This control should never be set any
+                lower than the GCR Lower Bound Value.  Setting this
+                control to zero means that only black ink is used to
+                print any gray value; setting this control to a value
+                greater than one means that some composite ink will be
+                used even when printing black.  The upper limit for
+                this control is 5 (in which case black will be printed
+                with no more than 20% black ink).
+
+                If you use an ink set requiring use of color inks to
+                produce neutral grayscale, you should set the GCR
+                Lower Bound Value to zero or a value very close to
+                zero and the GCR Upper Bound Value should be greater
+                than 1, along with a GCR Transition Value (below) of
+                1.  This will ensure that the proportion of black and
+                color inks will be close to constant throughout the
+                gray range.  With this kind of inkset, it's often
+                possible to produce cool or warm toned grayscale
+                prints by selecting Desaturated color correction and
+                adjusting the GCR Upper Bound Value appropriately.
+                For example, if the black ink has a brown (warm) cast,
+                increasing the GCR Upper Bound Value will yield a
+                cooler tone (less black ink) while decreasing it will
+                yield a warmer tone (more black ink).
+
+        GCR Transition Value
+
+                This control specifies the gamma of the GCR transition
+                curve.  Setting this control to a smaller value
+                results in less black ink being used in the lighter
+                portion of the transition region.  This control is
+                useful if the black ink is much darker than the
+                composite inks in order to produce a smoother
+                transition.
+
+        GCR Curve
+
+                This control (only available through the Print plugin
+                for the GIMP or other Gutenprint-based applications
+                that provide curve capability) allows you to specify
+                the conversion curve from gray to black/composite
+                precisely.  The horizontal axis of this curve
+                represents the gray level (between 0, or no gray at
+                all, and 1, or pure black); the vertical axis
+                represents the fraction of gray that is converted to
+                black (0 means only composite inks, and 1 means only
+                black ink).
+
+
+Output Linearization Curves
+
+    These controls permit adjusting the transfer (linearization)
+    curves of each channel precisely.  They are only available through
+    the Print plugin for the GIMP or other Gutenprint-based
+    applications that provide curve capability.  All of these controls
+    are considered to be for very advanced use only.
+
+        Black Curve
+        Blue Curve
+        Cyan Curve
+        Magenta Curve
+        Yellow Curve
+        Red Curve
+        Green Curve
+
+
+Detailed Color Correction Curves
+
+    These controls permit adjusting precise characteristics of color
+    generation/correction.  They are only available through the Print
+    plugin for the GIMP or other Gutenprint-based applications that
+    provide curve capability.  All of these controls are considered to
+    be for very advanced use only.
+
+    The horizontal axis of all of these curves represents the hue of
+    the output.  Hue is measured as an angle, where 0 and 360 degrees
+    represent cyan (or red, if the output inks are RGB).
+    Conventionally, these angles are represented as a number between 0
+    and 6 (each full number in this scale represents 60 degrees).  The
+    specific hue angles for CMY and RGB outputs are as follows:
+
+             \                  Ink Type
+        Angle \         RGB             CMY
+        -----  \        ---             ---
+           0    |       Red             Cyan
+           1    |       Yellow          Blue
+           2    |       Green           Magenta
+           3    |       Cyan            Red
+           4    |       Blue            Yellow
+           5    |       Magenta         Green             
+           6    |       Red             Cyan
+
+        Hue Adjustment Curve
+        Luminosity Adjustment Curve
+        Saturation Adjustment Curve
+
+                These controls adjust the color correction in High
+                Accuracy, Bright Colors, and Correct Hue Only color
+                correction modes.  These color correction modes work
+                by adjusting the hue, saturation, and luminosity (HSL)
+                of the output inks to achieve a more accurate color
+                than the color created by simply converting the red,
+                green, and blue inputs to cyan, magenta, and yellow
+                (or red, green, and blue) inks.  Note that in this
+                printing context luminosity represents darkness
+                (amount of light subtracted) rather than brightness.
+
+                The saturation and hue adjustments are first applied.
+                The luminosity correction operates on only the color
+                component of the output.  Before this correction is
+                applied, any gray value is removed, and added back
+                after the correction is completed.
+
+                The vertical axis of the Hue Adjustment Curve
+                represents an angular difference that is added to the
+                base hue value to generate the desired output.  For
+                example, if the blue output is purple (too close to
+                magenta), adding a negative value to that range of the
+                output will bring the blue value more toward cyan
+                (less magenta).
+                
+                The vertical axis of the Saturation Adjustment Curve
+                represents an amount by which the saturation is
+                multiplied.  At any given hue point it may take on any
+                value between 0 (eliminate all color saturation, which
+                is equivalent to converting to pure gray) and 4
+                (dramatically boost the saturation).  Therefore, this
+                adjustment may be used to tone down excessively
+                brilliant colors (e. g. if the reds are overly
+                brilliant) or brighten up dull colors (e. g. if the
+                greens are somewhat dull).  This control has no effect
+                if Correct Hue Only is used.  If the saturation value
+                is greater than 1, the effect differs depending upon
+                whether High Accuracy or Bright Colors mode is
+                selected: if Bright Colors is selected, the saturation
+                is simply multiplied by the desired value and then set
+                to 1 if it would exceed unity.  If High Accuracy mode
+                is selected, the amount of saturation boost is
+                decreased if the starting saturation is high.
+
+                The vertical axis of the Luminosity Adjustment Curve
+                represents an amount by which the luminosity is
+                multiplied.  At any given hue point it may take on any
+                value between 0 (remove the color component
+                altogether) and 1 (leave it as is).  Therefore, the
+                function of the Luminosity Adjustment Curve is to
+                lighten excessively dark colors rather than to darken
+                light colors.  This control has no effect if Correct
+                Hue Only mode is used.
+
+        Blue Map
+        Cyan Map
+        Magenta Map
+        Yellow Map
+        Red Map
+
+                These curves control how the auxiliary red and blue
+                inks are used on the Epson Stylus Photo R800, Stylus
+                Photo R1800, and PictureMate family of printers.
+                These printers use auxiliary inks to achieve more
+                brilliance in the red and blue.  Other printers in the
+                future may use other auxiliary channels, which will be
+                made available in similar fashion.
+
+                The vertical axis of each of these controls specifies
+                the amount of each ink that should be used to print
+                colors of that hue.  These curves are used only to
+                generate color; any gray component is removed prior to
+                the color generation and added back later.  For
+                example, it is possible to specify that a certain
+                shade of purple is printed using .2 red ink, .6
+                magenta ink, and .5 blue ink (hypothetically).
+
+
+Specialized Output Controls
+
+    These controls are used to modify the output in very
+    printer-specific ways.
+
+        Gloss Level Value
+
+                This control is provided on printers such as the Epson
+                Stylus Photo R800 and R1800 that offer a special gloss
+                enhancer to produce an even degree of gloss on glossy
+                papers regardless of the amount of ink used.  On
+                certain glossy papers, areas with high ink coverage
+                are a lot glossier than areas with little ink coverage
+                (highlights); the gloss enhancer is basically a
+                transparent ink that increases the gloss of these
+                areas.  This control specifies the desired total
+                amount of ink to be printed, including both the normal
+                color and black inks and the gloss enhancer.  If the
+                amount of normal inks is less than this amount, gloss
+                enhancer is used to increase the total amount of ink
+                used.
+
+
+Transition Controls
+
+    These controls adjust the level at which light inks (such as the
+    light cyan and magenta inks used on many "photo printers") are
+    used in place of the dark inks.  The light inks are used to
+    produce a smoother texture (less speckling); the light cyan
+    droplets, for example, are individually much less visible than the
+    normal dark cyan droplets.
+
+    The ink substitution works by replacing a certain amount of ink by
+    a mixture of the light and dark inks.  For example, the dark cyan
+    ink may be about 3 times as dark as the light cyan ink, so in
+    light areas the cyan may be replaced by 3 times as much light
+    cyan.  However, this only works up to a certain point; beyond that
+    point, adding more light ink does not significantly increase the
+    darkness of the ink.  These transition values adjust the limits at
+    which the ink substitution is done; the lower these limits are
+    set, the lighter the output at which dark ink is introduced.
+    Setting these values lower will generally yield more accurate
+    midtone colors at the expense of more speckling in the light
+    midtones and highlights.  Generally these values need to be lower
+    on low-quality paper than on high quality glossy paper.
+
+        Dark Yellow Transition Value
+        Light Gray Transition Value
+        Mid Gray Transition Value
+        Dark Gray Transition Value
+        Gray Transition Value
+        Light Cyan Transition Value
+        Light Magenta Transition Value
+        Light Yellow Transition Value
+
+
+Foomatic-only options
+
+    This control is available only when using the Foomatic interface.
+    It provides a collection of presets appropriate for various
+    printing tasks.  It is similar in concept to (and provided the
+    inspiration for) the Print Quality and Image Type options provided
+    in Gutenprint.
+
+        Printout Mode
diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag
index dede246..359a22e 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/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>g69e0971771118ccea2a5dc72ba4fa73e</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>gaf63aaff6ea861e16b3addc023ef2e66</anchor>
+      <anchor>ga1</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>g562ad19d8ecc1e9bdd8c182b0a05ecec</anchor>
+      <anchor>ga2</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>gab9b031be229d8762faf46a3ef9454ec</anchor>
+      <anchor>ga3</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>g19370f7d4779013904be75bc3d97e024</anchor>
+      <anchor>ga4</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>g698e51815f2ef3fd0709d6b32a2bb921</anchor>
+      <anchor>ga5</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>g48e34b2673c2973884f0a403bafe7ea8</anchor>
+      <anchor>ga6</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>g0ca3891b4cde193cc65de63053e3f4fa</anchor>
+      <anchor>ga7</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>g9e1c46379b5935ed3a939833bd9e68be</anchor>
+      <anchor>ga8</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>g4ab405205d678a3d9ae02a98103fbfea</anchor>
+      <anchor>ga9</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>gb9d53cf70f2c892dca82b8db2414fad2</anchor>
+      <anchor>ga10</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>g2051c3f4a1eaccb198744f8d7c76d649</anchor>
+      <anchor>ga11</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>bit-ops.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>ec711fffd61ebd40a6896d76d4c9327f</anchor>
+      <anchor>a0</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>65a4f2dc6c49d8a80e1d0ca72a1f0ffd</anchor>
+      <anchor>a1</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>24f21e067782cbb1606f4109f7acaccb</anchor>
+      <anchor>a2</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>9772ac792d8208e341d780fc756bf3cd</anchor>
+      <anchor>a3</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>7fdd081b1a58cdc3648e61d23aefb744</anchor>
+      <anchor>a4</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>534a4a10cda717aabaf212954cc2d891</anchor>
+      <anchor>a5</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>d472146a7bdf6c1e95bcb102c4409515</anchor>
+      <anchor>a6</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/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
     <filename>channel_8h</filename>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_reset</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>dc5c0cc7cc331da0ab394b642a381363</anchor>
+      <anchor>a0</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>6a88eb8e1f968370b63326e517a34ec2</anchor>
+      <anchor>a1</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>6a552629f3dddf6283f605e1961dd04f</anchor>
+      <anchor>a2</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>73265490d8c513de68604a982ec49e0a</anchor>
+      <anchor>a3</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>99f818da3b4944b328de9de860d04dbc</anchor>
+      <anchor>a4</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>0cfa6ae42ced76291f96ff64fed6a823</anchor>
+      <anchor>a5</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>9351c3b60ed0f43e012bbd2906b0f0b4</anchor>
+      <anchor>a6</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>f6423b74581fbf34918a9e45d22186b5</anchor>
+      <anchor>a7</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>4a04bbe68bd5c97d4b83cb1c1a147b48</anchor>
+      <anchor>a8</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>c868578c0a82a76d20160b23a9c9d603</anchor>
+      <anchor>a9</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>6d315737ed90af4b0b9bff8c907381c3</anchor>
+      <anchor>a10</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>00bbe8c93cbe8da9f431824dbb1dadcd</anchor>
+      <anchor>a11</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>38a09aeef9c53c039fa7d1124921a7c9</anchor>
+      <anchor>a12</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>a907ffda300039a00ae7ddb333038480</anchor>
+      <anchor>a13</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>4349853a306208c7d98074a585991ef0</anchor>
+      <anchor>a14</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>e1702ed4a233cadce00e9bc87fd5ca45</anchor>
+      <anchor>a15</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>42d1438e758951e81ff49fbf81e73d2b</anchor>
+      <anchor>a16</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>619228b113312c73cdce75b15bb88313</anchor>
+      <anchor>a17</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>2ce95b47a5f1a6c146588e0fb49db2e4</anchor>
+      <anchor>a18</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>0f1e6073d53036f6771a0cc69cf9e261</anchor>
+      <anchor>a19</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>00b63c73990babb75e5896ffd7022634</anchor>
+      <anchor>a20</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>cef9de964c7569983e1ff1d0550d3bd6</anchor>
+      <anchor>a21</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>f5ef85fbc689b2f94c0be23c0b8b3765</anchor>
+      <anchor>a22</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>9c4df56f4ad83b6232cf6ec17b6dc031</anchor>
+      <anchor>a23</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>color.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>gb711e2534c69bde47be7af3409c8ee2c</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_init</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>g835bd7024477347a46ea0c14b46996c6</anchor>
+      <anchor>ga1</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>gadf861820b3956ef7b18600dbf5da9da</anchor>
+      <anchor>ga2</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>ge2e397268288111eaffd352cb0ff1b98</anchor>
+      <anchor>ga3</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>gc47fecc2c32115494ea364e53d9f1ff2</anchor>
+      <anchor>ga4</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>ge3543409e331c5d1756c2c8fe927343b</anchor>
+      <anchor>ga5</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>g3e0f2728d47e1701c00b06199bc5512d</anchor>
+      <anchor>ga6</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>ga8b8b19da7bcc9bc814fe0f97f39b3ed</anchor>
+      <anchor>ga7</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>g25d9ee3ceee6d6e9964007ad12f9900b</anchor>
+      <anchor>ga8</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>ga5ddc4c9d02576154d0b2c6c64a6a033</anchor>
+      <anchor>ga9</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>ga92373d7aa315ab6e32a1bb0ac944b79</anchor>
+      <anchor>ga10</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>g36d2d72d2cd967405a978b76a7a8c992</anchor>
+      <anchor>ga11</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>ga0559d7812bdcbebe4edc14fc05274d9</anchor>
+      <anchor>ga12</anchor>
       <arglist>(const stp_color_t *c)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>curve-cache.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>c0763605d9b80d9889407dd340e357fd</anchor>
+      <anchor>a0</anchor>
       <arglist>(cache)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>CURVE_CACHE_FAST_DOUBLE</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>b434b6a3a8ce63d95d11b2bce6360536</anchor>
+      <anchor>a1</anchor>
       <arglist>(cache)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>CURVE_CACHE_FAST_COUNT</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>b8c3f0a2734a4bdb08989cc62761e8e7</anchor>
+      <anchor>a2</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>3cef707d88b48136a52f733f80ae52dd</anchor>
+      <anchor>a3</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>5cb281dd07eecda913b168451b2d615b</anchor>
+      <anchor>a4</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>256ae4356b6205ba61fbc6b5e90c1762</anchor>
+      <anchor>a5</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>7966337362f5e8fc0ed54edd8da645a2</anchor>
+      <anchor>a6</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>f775dcfafb717b24ff655cc801c14dfc</anchor>
+      <anchor>a7</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>33011bde2e051e0b222177b0db746da9</anchor>
+      <anchor>a8</anchor>
       <arglist>(stp_cached_curve_t *cache, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_curve_cache_get_count</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>723301540e82db80f8ce9100ec832876</anchor>
+      <anchor>a9</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>6a318767b044ac996ae318771f715a01</anchor>
+      <anchor>a10</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>83788e3f9d421bdab139d92127a7e5e3</anchor>
+      <anchor>a11</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>6a8addcc359b8cfbc2fa5c8cec97643d</anchor>
+      <anchor>a12</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/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>gd5ce135b7af2c6e79bae493c7055461d</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_type_t</name>
-      <anchor>g7ced905b29f0d85de94258dceb01c3f4</anchor>
+      <anchor>ga47</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_LINEAR</name>
-      <anchor>gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff</anchor>
+      <anchor>gga47a1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_SPLINE</name>
-      <anchor>gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4</anchor>
+      <anchor>gga47a2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_wrap_mode_t</name>
-      <anchor>g1880ff988f772337e8892e791951337b</anchor>
+      <anchor>ga48</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_NONE</name>
-      <anchor>gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85</anchor>
+      <anchor>gga48a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_AROUND</name>
-      <anchor>gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2</anchor>
+      <anchor>gga48a4</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_compose_t</name>
-      <anchor>gb7d718baf4619b6be6c4aff8ce84aad9</anchor>
+      <anchor>ga49</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_ADD</name>
-      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d</anchor>
+      <anchor>gga49a5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_MULTIPLY</name>
-      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011</anchor>
+      <anchor>gga49a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_EXPONENTIATE</name>
-      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701</anchor>
+      <anchor>gga49a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_bounds_t</name>
-      <anchor>gd2b61113497bb142943d5131df3286ae</anchor>
+      <anchor>ga50</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_RESCALE</name>
-      <anchor>ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09</anchor>
+      <anchor>gga50a8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_CLIP</name>
-      <anchor>ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41</anchor>
+      <anchor>gga50a9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_ERROR</name>
-      <anchor>ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a</anchor>
+      <anchor>gga50a10</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>gf6b71d25c497e99ab2c073108b080ab6</anchor>
+      <anchor>ga1</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>ge76787e84f2fc3ba299de94f4ecc6d82</anchor>
+      <anchor>ga2</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>gfdafb0a802f00063b00713dbd6d6bfc0</anchor>
+      <anchor>ga3</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>g01bf94ed6a523f28dd909be054a69790</anchor>
+      <anchor>ga4</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>g5283a18fcc5db8e9f9384d54de50ba83</anchor>
+      <anchor>ga5</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>g4d32e3000dd3a8f258b2eab94797731b</anchor>
+      <anchor>ga6</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>gd2aade6a22b516006ce0f897c5027f35</anchor>
+      <anchor>ga7</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>gdda4313c874170e0086d2000ed04c02f</anchor>
+      <anchor>ga8</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>gaf8bad025ea7463067c9d7ab205af062</anchor>
+      <anchor>ga9</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>g48d9023f28ae2d15975002f7a9d7f94e</anchor>
+      <anchor>ga10</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>g3175711d943e95fdf363d5124237a56e</anchor>
+      <anchor>ga11</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>gca245aa6907c2fb95e150ce9a86ddb1a</anchor>
+      <anchor>ga12</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>gba540befdbd82e705358b2175d5b92e8</anchor>
+      <anchor>ga13</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>gcbd01a2662edb48af0816930b40dc8ab</anchor>
+      <anchor>ga14</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>gc0401bfefa3990ca26a0fb7718f1ebb2</anchor>
+      <anchor>ga15</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>gaf770dcae26ce48d5ee50dd8217e2c14</anchor>
+      <anchor>ga16</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>g184e0e32892aae4b2c195c6fc880bace</anchor>
+      <anchor>ga17</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>gbc9ae004e972c7d638336714f3112f9b</anchor>
+      <anchor>ga18</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>g8a215d4981a74fb2b6e4a0c381314df0</anchor>
+      <anchor>ga19</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>gd23dcc9abefca9a98b3ecd9714227093</anchor>
+      <anchor>ga20</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>g4051de3e6be42f4499de78af67288616</anchor>
+      <anchor>ga21</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>gd4cfbfbfe0c16b8f2ef4d8c44d221172</anchor>
+      <anchor>ga22</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>g0ba6753a8beeaca19719d047da25ecb5</anchor>
+      <anchor>ga23</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>g24b9486c45d68983e94dcc0fb19edacd</anchor>
+      <anchor>ga24</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>gd30e41654f1e0217aae3389b30cdffba</anchor>
+      <anchor>ga25</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>gf363a0f9686bcd6521671d531bc522d5</anchor>
+      <anchor>ga26</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>g187af251d5a89853545c8be898a00cc1</anchor>
+      <anchor>ga27</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>g3ecbc0ce98e7bd7695002306f5a2ba1b</anchor>
+      <anchor>ga28</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>g01bda0b947a6075d4a1ed373865744e6</anchor>
+      <anchor>ga29</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>gb874365285383f3eb35c1a32496a69b4</anchor>
+      <anchor>ga30</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>g60767bb2143fe4d491d351a4c0abc3b1</anchor>
+      <anchor>ga31</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>gb2312169172ec9789af9fd38279b3273</anchor>
+      <anchor>ga32</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>gee3cc69ab758b400838014df4742c28e</anchor>
+      <anchor>ga33</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>g6548b7ca6ef6ab94fe1d927c246e7baf</anchor>
+      <anchor>ga34</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>gc9786b35c2b1a55d54b62bcc57481c82</anchor>
+      <anchor>ga35</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>g9a05eae4f274f420418539cceb627556</anchor>
+      <anchor>ga36</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>gf9ff6f55ec0a0615608dc1baec6aff00</anchor>
+      <anchor>ga37</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>g0fdfc2b27a8a464584589ef38a8e05c4</anchor>
+      <anchor>ga38</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>gf68cf2508ff4a14a0dbee6fc0001667e</anchor>
+      <anchor>ga39</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>gd440d8d448173adc2be6737963a6e999</anchor>
+      <anchor>ga40</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>g6ef71ce7d92e659b1c902df29b1dcbc7</anchor>
+      <anchor>ga41</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>g21aa4497c58ebbb703dc3549560f084d</anchor>
+      <anchor>ga42</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>g650e49e1250dab5d9221ad747a627fc0</anchor>
+      <anchor>ga43</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>g6ff03fcc2a47f297c48b683884e81924</anchor>
+      <anchor>ga44</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>g60dce8c741a9b6fde73ced2134305298</anchor>
+      <anchor>ga45</anchor>
       <arglist>(const char *string)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_compose</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>g657e0ad5b93f090220d35be615fec5e4</anchor>
+      <anchor>ga46</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/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>4faa7aec0dc7471ed5a7d1622991ac77</anchor>
+      <anchor>a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_C</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>575ca9b45d518b92177323e70295198a</anchor>
+      <anchor>a1</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_M</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>c7f1f45ff56dfbaff0a36599c6bf822c</anchor>
+      <anchor>a2</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_Y</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>e1492502d48a830e5dda11f1d7afb494</anchor>
+      <anchor>a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_NCOLORS</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>3e02bef38f178e66a4439df6ec61c503</anchor>
+      <anchor>a4</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>373f2efaf250ca412b5447b8bd4e7f51</anchor>
+      <anchor>a5</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>a7bbfbb8dd05a8c05a5c37143adc129a</anchor>
+      <anchor>a6</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>c81f99c36dbc48c619831897bac28224</anchor>
+      <anchor>a7</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>613c628e788dbef089fa32243500cd54</anchor>
+      <anchor>a8</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_dotsize</type>
       <name>stp_dotsize_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>0a4617ed6063c68c6c8675fb9e8e9d01</anchor>
+      <anchor>a9</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_shade</type>
       <name>stp_shade_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>737b4edb8992127d0616e78f6c0a4c14</anchor>
+      <anchor>a10</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_iterated_init</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>e79d2866600d79be412b660f036995f4</anchor>
+      <anchor>a11</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>1c29e4d285f27f7fd300643f7023f305</anchor>
+      <anchor>a12</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>8346fdae0bfb7422f52c0a2eec3abd87</anchor>
+      <anchor>a13</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>6a7a7142c53dd1cd70b3f7fb481e5564</anchor>
+      <anchor>a14</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>05677f96e6de536ecf91a65ee0715998</anchor>
+      <anchor>a15</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>a9efd9cefabdab92a8ce5fbf7aca8876</anchor>
+      <anchor>a16</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>361cf36b4875e8ef2c8152f66d4a9284</anchor>
+      <anchor>a17</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>aaa6d937beb5f9bef6e7ec34fc776d54</anchor>
+      <anchor>a18</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>289ae89081129060bf67371d7ce9fcef</anchor>
+      <anchor>a19</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>0d1f33cd934e13ed0b0f859d131efbc1</anchor>
+      <anchor>a20</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>c329929a25c54355a7ed23f23616ced5</anchor>
+      <anchor>a21</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>ef8ca9aa08ab848746e370100a4b20e2</anchor>
+      <anchor>a22</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>9ad687cfc22956dd88495ae0a831c1b6</anchor>
+      <anchor>a23</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>6daf654828bc5235bc785fceb8aebb89</anchor>
+      <anchor>a24</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>6d409bf6395231621a725a45fac8bb8e</anchor>
+      <anchor>a25</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>85eb5568b8a8036271e50794519c08e2</anchor>
+      <anchor>a26</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>25b3d76810fd0dcb0928edff37060409</anchor>
+      <anchor>a27</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>ae5be944ec353d075ea17c32370270bd</anchor>
+      <anchor>a28</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>d7cd0b4e7bf474516b14d0a186b23b96</anchor>
+      <anchor>a29</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>6d8fc8a344a764f92ee43ff8b959aace</anchor>
+      <anchor>a30</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>744fa9a5d204da486f07a8f1b21c9ba3</anchor>
+      <anchor>a31</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>d261306c74a8affdf11ad2cc519e8bba</anchor>
+      <anchor>a32</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>f113ac1043230813204db189e3fd84a8</anchor>
+      <anchor>a33</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>e13f1c62835c48c5fb58b45c8ed35f32</anchor>
+      <anchor>a34</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>ffc1834e675956e79ae5a866895db39c</anchor>
+      <anchor>a35</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>0aae5a947e8953323b097fbb79c93c68</anchor>
+      <anchor>a36</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>fd1d75ef5cfb0e013601a4e084352786</anchor>
+      <anchor>a37</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>28bb47c7e1436e2c4af3b0be87b5d1c6</anchor>
+      <anchor>a38</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>94da054fb7a3f42cf4c2937f4d37e528</anchor>
+      <anchor>a39</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>a22b0e4fe00acaf11ce611e29f1b1ba3</anchor>
+      <anchor>a40</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>e1fe7fb65133dd6ffc227e6fcdd18fdd</anchor>
+      <anchor>a41</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/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>gac0316f33cabc5a70d974c5aba43063b</anchor>
+      <anchor>ga0</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>geb8333d9b46653f2047c603034d26730</anchor>
+      <anchor>ga1</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor>
+      <anchor>ga2</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor>
+      <anchor>ga3</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>gcf29daa2fef5f417c57be476054c695b</anchor>
+      <anchor>ga4</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor>
+      <anchor>ga5</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor>
+      <anchor>ga6</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-intl.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
     <filename>gutenprint-intl_8h</filename>
     <member kind="define">
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor>
+      <anchor>ga0</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>geb8333d9b46653f2047c603034d26730</anchor>
+      <anchor>ga1</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor>
+      <anchor>ga2</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor>
+      <anchor>ga3</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>gcf29daa2fef5f417c57be476054c695b</anchor>
+      <anchor>ga4</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor>
+      <anchor>ga5</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor>
+      <anchor>ga6</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-module.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>47eb7c01a3f89d34af8ea0b2c9ca32a1</anchor>
+      <anchor>a0</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-version.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>g98b05dcc61492d413bb01421995f1421</anchor>
+      <anchor>ga7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MINOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g26319655da45e42c3b498ae7db0bf62c</anchor>
+      <anchor>ga8</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MICRO_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g02b38fef35caed8b676941e8dd8aadae</anchor>
+      <anchor>ga9</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CURRENT_INTERFACE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g08cdc7e05ec4d52b2458470b6d0047fb</anchor>
+      <anchor>ga10</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_BINARY_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ge754fd2fde377ba0bbe61aee1a31dd9a</anchor>
+      <anchor>ga11</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_INTERFACE_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>gfd63347e8d3a71fa8384db59deabbde5</anchor>
+      <anchor>ga12</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHECK_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g26c662a55c391d11663052ca39458972</anchor>
+      <anchor>ga13</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>g888f2f6268a658d1a6b71b5288299488</anchor>
+      <anchor>ga6</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>g19a4efe48689fb8f859d04e60bfe028f</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_minor_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g66def32167cee385762282e36b60d3b7</anchor>
+      <anchor>ga1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_micro_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g24960731fb86305c31f0be5621ccb993</anchor>
+      <anchor>ga2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_current_interface</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g78c76c5831f5046eee8a56bd010b24dc</anchor>
+      <anchor>ga3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_binary_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g97878c63aacb7d1fa8eed6cf1168c2e0</anchor>
+      <anchor>ga4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_interface_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>gf242f39e07a0ab2f2e25e1b7bc3e3aac</anchor>
+      <anchor>ga5</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>gf71d7111a7215d4c1f1ef1317f9d6cfc</anchor>
+      <anchor>ga8</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_image</type>
       <name>stp_image_t</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>gc5b6b70cd39959ffd06deab3724d87e9</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_image_status_t</name>
-      <anchor>g3378dd231cc63da06de0bb41f1cde78f</anchor>
+      <anchor>ga9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_OK</name>
-      <anchor>gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5</anchor>
+      <anchor>gga9a2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_ABORT</name>
-      <anchor>gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b</anchor>
+      <anchor>gga9a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_init</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>g74c2417d571861506be7209421a3b418</anchor>
+      <anchor>ga1</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>g69cd20ccb54500d0ee8cf38969db69a6</anchor>
+      <anchor>ga2</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>g9ee4915d4a1007f2d9c730ddc96d931b</anchor>
+      <anchor>ga3</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>g48a99a9a8493b75687ad0900664ca4cb</anchor>
+      <anchor>ga4</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>gfc93a7a3f6629f6826bf1f6f757f464e</anchor>
+      <anchor>ga5</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>gd36123431e93e049d813894aa039c25c</anchor>
+      <anchor>ga6</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>gd1017f2f9b91d7add73c2393d96f700a</anchor>
+      <anchor>ga7</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>list.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>g71c64aeca8ca0613215306f088b6a963</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_list</type>
       <name>stp_list_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g01be7c3ea8c46226978010d453016f22</anchor>
+      <anchor>ga1</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_node_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g3744d9043311d0bcbb21f80e79b9afba</anchor>
+      <anchor>ga2</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>void *(*</type>
       <name>stp_node_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g589c7c30b003d694b844834a41a6b1fa</anchor>
+      <anchor>ga3</anchor>
       <arglist>)(const void *)</arglist>
     </member>
     <member kind="typedef">
       <type>const char *(*</type>
       <name>stp_node_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g1c6584d7cf0cda45dce5d95249af6470</anchor>
+      <anchor>ga4</anchor>
       <arglist>)(const void *)</arglist>
     </member>
     <member kind="typedef">
       <type>int(*</type>
       <name>stp_node_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>gd7ac92a42bf2184103e0a83147d1835f</anchor>
+      <anchor>ga5</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>gb357e17f729e41b4f96d6aada1be26b9</anchor>
+      <anchor>ga6</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>gaf10e4bb8ce6a8b6f5f015475400eb1b</anchor>
+      <anchor>ga7</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_list_copy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g3bd2f5a42d3313287017bfe20859c2d9</anchor>
+      <anchor>ga8</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>g1382e926901b5efa2356176826a96a1a</anchor>
+      <anchor>ga9</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>ga67c8173f8c7b2c40e3d6dde6578faec</anchor>
+      <anchor>ga10</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>g2ef0298e970fdb93955860e7ee3f878c</anchor>
+      <anchor>ga11</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>g9885458dd0f6e6fe5c88c4b2b0643e2a</anchor>
+      <anchor>ga12</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>g0fd0ea2439ab2b0c9b9fb97f14c9a470</anchor>
+      <anchor>ga13</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>gdbf12ab6f47d68f2605f211023c4f520</anchor>
+      <anchor>ga14</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>g013ca40ec7e5714fc5ee5f31ac5582bc</anchor>
+      <anchor>ga15</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>gc103cb4ff8870b3a8d90b6ebcade2498</anchor>
+      <anchor>ga16</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>g9d344e3c6874e6033f8fc71370678bcf</anchor>
+      <anchor>ga17</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>gec59dd3b87efc811ef2b6303102ed279</anchor>
+      <anchor>ga18</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>g310dd79907494b07d9005fbf50b9eb0c</anchor>
+      <anchor>ga19</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>g97d7c6d659aa7d05bc54a349a07e10c0</anchor>
+      <anchor>ga20</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>g468cc0a5dfb1bfbef9eebd8d4f644492</anchor>
+      <anchor>ga21</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>g42bdba5fcb861bdf8facb9135039d9b8</anchor>
+      <anchor>ga22</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>ga95d8ace9b6ec71388007024c51865cb</anchor>
+      <anchor>ga23</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>gbad08ce8ef257dae054ea3816ae88fe7</anchor>
+      <anchor>ga24</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>ga759fd3cb97b9f651424b8a8fb6bedaa</anchor>
+      <anchor>ga25</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>g50f49648801707436012cd5dc66b1f8c</anchor>
+      <anchor>ga26</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>gde2acf279e8ea067fdc1f3f951d0b373</anchor>
+      <anchor>ga27</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>gcee23493eafdfcfce51e2ccf29ebbf54</anchor>
+      <anchor>ga28</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>gea9c1b6daae518ebecd2981289c555f3</anchor>
+      <anchor>ga29</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>g5b7d8ffea5a806953a43aee961a60fe4</anchor>
+      <anchor>ga30</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>g1b5d2889a81d712c3ba024e53bfd0f38</anchor>
+      <anchor>ga31</anchor>
       <arglist>(stp_list_item_t *item, void *data)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>module.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>a6058b6828d19e60a3e6c86b242da863</anchor>
+      <anchor>a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_module</type>
       <name>stp_module_t</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>1bc0723b8b43547b333980913ea42965</anchor>
+      <anchor>a1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_module_class_t</name>
-      <anchor>df2656b9a248237bdf28247c133a046d</anchor>
+      <anchor>a13</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_INVALID</name>
-      <anchor>df2656b9a248237bdf28247c133a046d3e5e52c14fb2598ee9f26fc2ac954452</anchor>
+      <anchor>a13a2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_MISC</name>
-      <anchor>df2656b9a248237bdf28247c133a046dc2ba6cf4fb480d88b9cc46d218527c01</anchor>
+      <anchor>a13a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_FAMILY</name>
-      <anchor>df2656b9a248237bdf28247c133a046d109d3cf2d0d4a476e0e488b3c482bea6</anchor>
+      <anchor>a13a4</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_COLOR</name>
-      <anchor>df2656b9a248237bdf28247c133a046d8fffd27ac2f7e9a5a5eec77a2cec8ad0</anchor>
+      <anchor>a13a5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_DITHER</name>
-      <anchor>df2656b9a248237bdf28247c133a046d47128dd421ef22c57a852b5157b3627c</anchor>
+      <anchor>a13a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_load</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>b07deb48be35f70644fcc6013b4debd9</anchor>
+      <anchor>a7</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_exit</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a5bfe6fda569e476ad52024d31eca3c4</anchor>
+      <anchor>a8</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_open</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>401000da13e2a7aacab2738838bf1fb2</anchor>
+      <anchor>a9</anchor>
       <arglist>(const char *modulename)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_init</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>8d52ac8df2ff7c4a28900fbb598c4848</anchor>
+      <anchor>a10</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_close</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>8e114f6e561ea2a5c4186b31eea363ad</anchor>
+      <anchor>a11</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>60ee652d3ddc0bf99abc8155b4e35a01</anchor>
+      <anchor>a12</anchor>
       <arglist>(stp_module_class_t class)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>mxml.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>76508c60800b84b90acf4e0f8e04288e</anchor>
+      <anchor>a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_TAB</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>24760270636887d4dbbccca15164f4eb</anchor>
+      <anchor>a1</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_NO_CALLBACK</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>70032c4eda848436305b71f40cf913f7</anchor>
+      <anchor>a2</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_NO_PARENT</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>934b8d5744f37ba24d529a86f6e5f2e7</anchor>
+      <anchor>a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_DESCEND</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>2ed08f4813ad57773f412970856517f5</anchor>
+      <anchor>a4</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_NO_DESCEND</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>42831d4e1a69e57461d655f610bb995a</anchor>
+      <anchor>a5</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_DESCEND_FIRST</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>2692b08783d224aa4f726b13c4a7da68</anchor>
+      <anchor>a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_BEFORE_OPEN</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>85b05ecef2dd56e2d66b0c3057705a9b</anchor>
+      <anchor>a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_AFTER_OPEN</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>312f2553f5c5e2f974ca8f238064dadd</anchor>
+      <anchor>a8</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_BEFORE_CLOSE</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>5ef0809e92527718236cf91e591f1276</anchor>
+      <anchor>a9</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_AFTER_CLOSE</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>1ffe9b0d18eb95e8b85da3d09b195aee</anchor>
+      <anchor>a10</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_ADD_BEFORE</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>7ac1110fe031c1c8274171dda7c65ee8</anchor>
+      <anchor>a11</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_ADD_AFTER</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>aef62f3dd5005be25edf46856ffd0e67</anchor>
+      <anchor>a12</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_ADD_TO_PARENT</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>7183b4ceb133647a5b559de1549356d1</anchor>
+      <anchor>a13</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>1ed6fadf477121e16a83bc1899c30d5c</anchor>
+      <anchor>a14</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>1ed814dbc1628ca237bed68e27043438</anchor>
+      <anchor>a15</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>504a90f35ed408a7f80f6dbdadf45ae4</anchor>
+      <anchor>a16</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>a2b9c7f1c79258abe63be05529b2a908</anchor>
+      <anchor>a17</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>d162e4b65493580e8bee75ef0c8c12b6</anchor>
+      <anchor>a18</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>1d1a605dff310b7538b297c8e63b1d88</anchor>
+      <anchor>a19</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_mxml_type_e</name>
-      <anchor>dc40006361fa674950bded00ecfe2af1</anchor>
+      <anchor>a43</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_ELEMENT</name>
-      <anchor>dc40006361fa674950bded00ecfe2af14ba5265c3afb36dd232d06654057b5e0</anchor>
+      <anchor>a43a20</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_INTEGER</name>
-      <anchor>dc40006361fa674950bded00ecfe2af1956325ecfc4010c94a12c6b27a4f6092</anchor>
+      <anchor>a43a21</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_OPAQUE</name>
-      <anchor>dc40006361fa674950bded00ecfe2af1c584cda537b2d2dbf925771121783f2d</anchor>
+      <anchor>a43a22</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_REAL</name>
-      <anchor>dc40006361fa674950bded00ecfe2af13ab4fa5909280fe38cd797602bbde38d</anchor>
+      <anchor>a43a23</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_TEXT</name>
-      <anchor>dc40006361fa674950bded00ecfe2af1327390d3a536298d1c0a4da5f8a26fb6</anchor>
+      <anchor>a43a24</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_mxmlAdd</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>f5b1214c9e580debaf0350f31d03467d</anchor>
+      <anchor>a25</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>cbdf0579701e7776af87fbb3c2bf9469</anchor>
+      <anchor>a26</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>23f0ed075c389d9681fb5ed3c2ecddb9</anchor>
+      <anchor>a27</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>eae678d773da3b4075f1feea1b14eb84</anchor>
+      <anchor>a28</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>7c0efd099878ce90b220bf4c51324cce</anchor>
+      <anchor>a29</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>db392c4e623e72d2b1985058564abf5d</anchor>
+      <anchor>a30</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>9e275680a5730ef159757b20e041723d</anchor>
+      <anchor>a31</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>305b60c2a9554ac30bb195e42cc82e75</anchor>
+      <anchor>a32</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>e65d5658c5271a9e26c5a21bc0cc2f20</anchor>
+      <anchor>a33</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>533ea6ec53f37f8bdd2d89d667b0d10a</anchor>
+      <anchor>a34</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>7754bd0d9af2be6edaeac7edf9c89c93</anchor>
+      <anchor>a35</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>41566f9adbe5fe307a4643e073e3d914</anchor>
+      <anchor>a36</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>6abe55831d77332db6b94b6cc0caaf02</anchor>
+      <anchor>a37</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>e3723cad1353a2142fc1abaee599380c</anchor>
+      <anchor>a38</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>bfabbd9dfdce248edc2f47de1faee7c3</anchor>
+      <anchor>a39</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>18d0fb42d5adb6b4337df82e61116050</anchor>
+      <anchor>a40</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>be88dab827e68c48b822c6250731fc57</anchor>
+      <anchor>a41</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>112485e5f15808619af7dd558528323f</anchor>
+      <anchor>a42</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/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>gbb66a8f6ce85d70afd9fe42472b492d8</anchor>
+      <anchor>ga5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_STANDARD</name>
-      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65</anchor>
+      <anchor>gga5a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_STANDARD</name>
-      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35</anchor>
+      <anchor>gga5a1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_EXTENDED</name>
-      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d</anchor>
+      <anchor>gga5a2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_EXTENDED</name>
-      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a</anchor>
+      <anchor>gga5a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_known_papersizes</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>g93eb4d6bc44914b3ea6b184e076a0853</anchor>
+      <anchor>ga0</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>g9d655e3de6954ad3c5933dc736d2509a</anchor>
+      <anchor>ga1</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>g0438b0e4729f37579900b591e801f8ce</anchor>
+      <anchor>ga2</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>g08bb891f58a7decfee2b073c00715993</anchor>
+      <anchor>ga3</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_default_media_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>g2fe5d85acaa4ff8b8e4ad1ff3cccb027</anchor>
+      <anchor>ga4</anchor>
       <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>path.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>8591072873a5ee644a6dd22538d84c55</anchor>
+      <anchor>a0</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>bc40460305f1f4f972c08a439f406449</anchor>
+      <anchor>a1</anchor>
       <arglist>(stp_list_t *list, const char *path)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>printers.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>g1a68662b730d44c11de6fb8226a309f6</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_family</type>
       <name>stp_family_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>g5c0458c3c1d19474e0245c47dac29e70</anchor>
+      <anchor>ga1</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_model_count</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>gc0a8108170f5c86621de14296fd94b1e</anchor>
+      <anchor>ga2</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>g1286559c60d239563f9f15fdd27996e0</anchor>
+      <anchor>ga3</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>gc041944e528afcb9a795eb6ece3fc6ff</anchor>
+      <anchor>ga4</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>g947fa230e08f9c854ca2608e76bd0d58</anchor>
+      <anchor>ga5</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>gcb4cdcada01ff29c5fd4ffeaa576db9e</anchor>
+      <anchor>ga6</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>g6f32b0213b580bf081fc8752a3eb04a1</anchor>
+      <anchor>ga7</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>g00182878bdc39935e6382d7e41d55294</anchor>
+      <anchor>ga8</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>g6c6c426f86307660079277ab6e90ae3d</anchor>
+      <anchor>ga9</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>g9c98ccc58b2c6f9ed6bd1025220ff77d</anchor>
+      <anchor>ga10</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>gfc0382fd32b49ea9d171e4ce8b750c62</anchor>
+      <anchor>ga11</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>g7ba104f0ea5ce4a88175486894010b71</anchor>
+      <anchor>ga12</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>ge67398e65540b835f5c5d073c5ea0ec1</anchor>
+      <anchor>ga13</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>gc3d8cdb65382cb13ea6b01072e6240d5</anchor>
+      <anchor>ga14</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>g121125e6646c6f6d8965f1857450749e</anchor>
+      <anchor>ga15</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>g9cf59fba866430dd47508bac6561ef67</anchor>
+      <anchor>ga16</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>g40637834f08a166992325af09f6a6030</anchor>
+      <anchor>ga17</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>gc09e99e20c8a19a13a5fb6356742a92a</anchor>
+      <anchor>ga18</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>gd91f8e7a622725f0d47196cf912ddd8d</anchor>
+      <anchor>ga19</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>g82b22438444849bdedb4cfbe22f209e8</anchor>
+      <anchor>ga20</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>ga2ab30a5e5442b7a552fc3b884e1511b</anchor>
+      <anchor>ga21</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>gc9aba62164667822fd9f110740bab570</anchor>
+      <anchor>ga22</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>g666486047edfe4405d003b5c3bbe4b49</anchor>
+      <anchor>ga23</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>g806f00d4167762c7a3d467ec37c8430e</anchor>
+      <anchor>ga24</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>g950e2cd193926440ba250dbc184d8588</anchor>
+      <anchor>ga25</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>sequence.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>gb3d4cae653c4303a6e5d26b516694c92</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>g771327bed5a71d8d33cc6b3ec5cbdbee</anchor>
+      <anchor>ga1</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_destroy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>g98c9c2859d2ebe9b1987d26b62bd6ce0</anchor>
+      <anchor>ga2</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>g5792d6f821525514199dd2d9b332ddd4</anchor>
+      <anchor>ga3</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>gd37eb66db88ac93b853ba6e02b9155bc</anchor>
+      <anchor>ga4</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>gd56df3112937c11431e033f2d9574b96</anchor>
+      <anchor>ga5</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>g392e1da122d95d6fc07b6d73eff1d311</anchor>
+      <anchor>ga6</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>gc2c70c539a3eced45be306d082faa3a6</anchor>
+      <anchor>ga7</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>g166e9a610bd53cb812e328d9e111f240</anchor>
+      <anchor>ga8</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>g99292c5ba10bcf1574c3e71a593c3e5f</anchor>
+      <anchor>ga9</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>g24024e771a50db02f2713b244212603e</anchor>
+      <anchor>ga10</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>g9b41ba7e0f1fb00cf19bbb9efe70824d</anchor>
+      <anchor>ga11</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>gc33208fae031bd1111f8ceb4c1425199</anchor>
+      <anchor>ga12</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>gf7f49101192387e29399ded6d3166d13</anchor>
+      <anchor>ga13</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>g044210129f28c298152ce124371324d4</anchor>
+      <anchor>ga14</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>g34a526cb5e72b611ac8a98b559c24e2e</anchor>
+      <anchor>ga15</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>gd15e2cf350bb311da58f4b11240fa0f2</anchor>
+      <anchor>ga16</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>gbc7ec322716d761436e4ad2d5d2f756f</anchor>
+      <anchor>ga17</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>gd4f058b2c690ad4e326970cc841d8f79</anchor>
+      <anchor>ga18</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>g40cd6256eb5bb72decd60edd1dc3be54</anchor>
+      <anchor>ga19</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>ge0d6719f863a10422dea23e7f4b4dd29</anchor>
+      <anchor>ga20</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>g68aed44bbf6ede9ac49237091f2deb43</anchor>
+      <anchor>ga21</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>gf8cd9da688af479103cf8600e48f61c9</anchor>
+      <anchor>ga22</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>g864b55caa3a8c0e573031a36f57f7cc4</anchor>
+      <anchor>ga23</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>gc4557b9fba98a7fbb4e17cc18fb0dded</anchor>
+      <anchor>ga24</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>g4396baf0d338eec6f3bce3e2000da978</anchor>
+      <anchor>ga25</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>g204f77e91c9283dc6ec6e742687bb0db</anchor>
+      <anchor>ga26</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>g91a68efd6b99150739c7706f65703a2f</anchor>
+      <anchor>ga27</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>g8bf46faeea891ac7ca699591df596bc1</anchor>
+      <anchor>ga28</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>string-list.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>6ec7eafa9cb77e5c4c2502e19f1a3f5b</anchor>
+      <anchor>a0</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>65077aa7201209fcaa58553d904fbc34</anchor>
+      <anchor>a1</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_string_list_destroy</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>35638794468f0bb0dd7b912dac655bd5</anchor>
+      <anchor>a2</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>997c38e27e8ad480118b84a6fdca4d79</anchor>
+      <anchor>a3</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>25fd88ec425121519cc25d5279d29e6f</anchor>
+      <anchor>a4</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>023eaab359b2f3c22d1a4fa7013e01ef</anchor>
+      <anchor>a5</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>e2f7a65ea28e02e39cc223898137127b</anchor>
+      <anchor>a6</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>b9e6a3a7944ca10102b1a30a3acc6767</anchor>
+      <anchor>a7</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>26d7d318ddcbe976df1c91134d1ab262</anchor>
+      <anchor>a8</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>a4938d0cb58828f5d27086ae9c400857</anchor>
+      <anchor>a9</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>333d878e45062e5f3ef5cf63602f4ce3</anchor>
+      <anchor>a10</anchor>
       <arglist>(const stp_string_list_t *list, const char *value)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>util.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>g9ef88b326f83d342849fa89c33c7e4a7</anchor>
+      <anchor>ga33</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_COLORFUNC</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g3560e33ba80d2a0ceb07fe51fac845be</anchor>
+      <anchor>ga34</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_INK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g328a4b66d0767134649ce30b243931c9</anchor>
+      <anchor>ga35</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g8d8211f97675b37f18bff822757d04b3</anchor>
+      <anchor>ga36</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PCL</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g30a9efd31b78debefd550d0b337ec795</anchor>
+      <anchor>ga37</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ESCP2</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g158e1ea4acff071440681ba678b6fb0b</anchor>
+      <anchor>ga38</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CANON</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga0d6b1a8d780b3c5f970454678bc0323</anchor>
+      <anchor>ga39</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LEXMARK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gb8180ab505c2d7c5a717a53096ac770c</anchor>
+      <anchor>ga40</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_WEAVE_PARAMS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gc746369f247dc346bcbdeacb1abbdbcb</anchor>
+      <anchor>ga41</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ROWS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gb764d477ebf0db4957cc316badac70bd</anchor>
+      <anchor>ga42</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MARK_FILE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g9c8f6255efb1fcf9cd3e7a68466e44ba</anchor>
+      <anchor>ga43</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LIST</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gcb3d85de1088cf795cfeaa9e1450c4e0</anchor>
+      <anchor>ga44</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MODULE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g6d69d079a3d7a3e0e2b870e1e9417187</anchor>
+      <anchor>ga45</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PATH</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gb11ef5f0ed150be2d3b999b7fc7e4f24</anchor>
+      <anchor>ga46</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PAPER</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g08f48f3423e848f1932435c5f8e94ff7</anchor>
+      <anchor>ga47</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PRINTERS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g7bbbf3d31a1a4f6b0da808184e1c1587</anchor>
+      <anchor>ga48</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_XML</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g51aee81a3d2a33d42417f6b61bb63f5e</anchor>
+      <anchor>ga49</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_VARS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g52844a51058ca29f975b5666743622ac</anchor>
+      <anchor>ga50</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_OLYMPUS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g4dc6609c9bb0c256fec7361f41a5c45f</anchor>
+      <anchor>ga51</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g9eaf8d50f127cd4316bf68ad34092551</anchor>
+      <anchor>ga52</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE_ERRORS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gc80b8553e636ec01fe4e975d9f7668b9</anchor>
+      <anchor>ga53</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_SAFE_FREE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g44a234fbf1ab832399fc674c8cb53b1f</anchor>
+      <anchor>ga54</anchor>
       <arglist>(x)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_init</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g69354e5830712093045a4ba290a298f8</anchor>
+      <anchor>ga0</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_set_output_codeset</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gf7978ce9e414b3d8ad905ee36a51cfbd</anchor>
+      <anchor>ga1</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>g21168356d466d278f11dab2be8d0016e</anchor>
+      <anchor>ga2</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>g9b6b2745ee2d68d1ca356a79c50f0ed7</anchor>
+      <anchor>ga3</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_prune_inactive_options</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gf64336e7c536a51d0debe88f1f5ec90a</anchor>
+      <anchor>ga4</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_zprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g18aaa3874e4dd5259a4d182fa8d9c90a</anchor>
+      <anchor>ga5</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>g9135d4c8cac78593aff55b668d09b79c</anchor>
+      <anchor>ga6</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>gf07e31a63021b4d504cc5a410e1aeb08</anchor>
+      <anchor>ga7</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>g01199dc1d5a3db973d22cc9db00a4f41</anchor>
+      <anchor>ga8</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>g3c20beae37d9841e095b336d6f7dcc1d</anchor>
+      <anchor>ga9</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>g0a445c531388afa31650ef4ccdac3ae1</anchor>
+      <anchor>ga10</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>gbe0e31fbc0c4e6374903b25edc594f5e</anchor>
+      <anchor>ga11</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>g0a59761c8a4ee5f31cfb9bec2a9b00b4</anchor>
+      <anchor>ga12</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>g23ee64de1ec6ef5a4941ab80ba609840</anchor>
+      <anchor>ga13</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>g859b75eddde620338859121451096097</anchor>
+      <anchor>ga14</anchor>
       <arglist>(int ch)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_eprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g47c73485971132d9b41a33bdf572f670</anchor>
+      <anchor>ga15</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>g5f6389ed7d500f851cabe8425a158e4b</anchor>
+      <anchor>ga16</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>g6bdd7099220fe310b228dcff5159b8d9</anchor>
+      <anchor>ga17</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>g34d3ebda7c5b75ab40d1600f4d79a4be</anchor>
+      <anchor>ga18</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>g9ab4c35dd4b6e142281ff36ecedee27e</anchor>
+      <anchor>ga19</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g24e214e32810cc67c493c270a6ad83d6</anchor>
+      <anchor>ga20</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>gf7bc1bd0ff92ca0f6ba7d0eb559e1da3</anchor>
+      <anchor>ga21</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>g26a43ceec27ca34bc49f4806900b4618</anchor>
+      <anchor>ga22</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>gf39c22b74843750ca74a6caccb263c7c</anchor>
+      <anchor>ga23</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_malloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g7c76d059684ee6dc5bdc06e4b3af18ef</anchor>
+      <anchor>ga24</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_zalloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gae1d98650ef9777ae4f4b10eae60b5c9</anchor>
+      <anchor>ga25</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_realloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g908f11aeabf31c8a9621bd65d408a5fc</anchor>
+      <anchor>ga26</anchor>
       <arglist>(void *ptr, size_t)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_free</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gabf89ff6213b9dc568fbdd1342b663ad</anchor>
+      <anchor>ga27</anchor>
       <arglist>(void *ptr)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_strlen</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g054943d301baecba82cdb78b7e454880</anchor>
+      <anchor>ga28</anchor>
       <arglist>(const char *s)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_strndup</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g2c6b28a35780bfa7d03a2f8381ee82c2</anchor>
+      <anchor>ga29</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>g2f861f4a98ad496ca8cd995147867f32</anchor>
+      <anchor>ga30</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>g77022a2cfde3a9ba9269f1bc3726175c</anchor>
+      <anchor>ga31</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_release_version</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ged2a65d98cba1fd6d48c0cc1b611ae0f</anchor>
+      <anchor>ga32</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>vars.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>gde33aeed00b53e4af71ee1f7c4326279</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void *</type>
       <name>stp_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gb264246d4b7e584447b5f39ed8f7ee05</anchor>
+      <anchor>ga1</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>const void *</type>
       <name>stp_const_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g73ac4d52cb5cecbb9694e9038fb7ea82</anchor>
+      <anchor>ga2</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_outfunc_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gd11be815334025415a8e2023e0cd44c5</anchor>
+      <anchor>ga3</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>gd31fc080a2bd980c6a05a541dc1612a3</anchor>
+      <anchor>ga4</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_free_data_func_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g3f7233002f4db790a077e33c2661665c</anchor>
+      <anchor>ga5</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>stp_compdata</type>
       <name>compdata_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g9ee295029ad2d072b4099dc390359900</anchor>
+      <anchor>ga6</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_type_t</name>
-      <anchor>ge031ab2c7ff60007e284ed71a73111e5</anchor>
+      <anchor>ga132</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_STRING_LIST</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2</anchor>
+      <anchor>gga132a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INT</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4</anchor>
+      <anchor>gga132a8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_BOOLEAN</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d</anchor>
+      <anchor>gga132a9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DOUBLE</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81</anchor>
+      <anchor>gga132a10</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_CURVE</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e</anchor>
+      <anchor>gga132a11</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_FILE</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6</anchor>
+      <anchor>gga132a12</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_RAW</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372</anchor>
+      <anchor>gga132a13</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_ARRAY</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d</anchor>
+      <anchor>gga132a14</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DIMENSION</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7</anchor>
+      <anchor>gga132a15</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INVALID</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576</anchor>
+      <anchor>gga132a16</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_class_t</name>
-      <anchor>g13c0565b3039fa25fd77092a578d44e9</anchor>
+      <anchor>ga133</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_FEATURE</name>
-      <anchor>gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11</anchor>
+      <anchor>gga133a17</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_OUTPUT</name>
-      <anchor>gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a</anchor>
+      <anchor>gga133a18</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_CORE</name>
-      <anchor>gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9</anchor>
+      <anchor>gga133a19</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_INVALID</name>
-      <anchor>gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606</anchor>
+      <anchor>gga133a20</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_level_t</name>
-      <anchor>gaa13470b0a857e96dbe70882b3fb8ebe</anchor>
+      <anchor>ga134</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_BASIC</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca</anchor>
+      <anchor>gga134a21</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc</anchor>
+      <anchor>gga134a22</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED1</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc</anchor>
+      <anchor>gga134a23</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED2</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8</anchor>
+      <anchor>gga134a24</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED3</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c</anchor>
+      <anchor>gga134a25</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED4</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff</anchor>
+      <anchor>gga134a26</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INTERNAL</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd</anchor>
+      <anchor>gga134a27</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_EXTERNAL</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203</anchor>
+      <anchor>gga134a28</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INVALID</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3</anchor>
+      <anchor>gga134a29</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_activity_t</name>
-      <anchor>gb11c7af74fa0595684377cafe4d4eb53</anchor>
+      <anchor>ga135</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_INACTIVE</name>
-      <anchor>ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab</anchor>
+      <anchor>gga135a30</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_DEFAULTED</name>
-      <anchor>ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136</anchor>
+      <anchor>gga135a31</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_ACTIVE</name>
-      <anchor>ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99</anchor>
+      <anchor>gga135a32</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_verify_t</name>
-      <anchor>g1d02c21b8f025b121dd340db9adf3516</anchor>
+      <anchor>ga136</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_BAD</name>
-      <anchor>gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25</anchor>
+      <anchor>gga136a33</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_OK</name>
-      <anchor>gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333</anchor>
+      <anchor>gga136a34</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_INACTIVE</name>
-      <anchor>gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9</anchor>
+      <anchor>gga136a35</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_vars_t *</type>
       <name>stp_vars_create</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gae35d353b6f86b1cbb97bb0b271f5c9a</anchor>
+      <anchor>ga7</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_vars_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g165ae58fed1515b5466ab1b84df85a86</anchor>
+      <anchor>ga8</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>g3c6d765cc5a27b322289e9baa9d97098</anchor>
+      <anchor>ga9</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>g78259fcaa881655a07ef0b2b457bdf70</anchor>
+      <anchor>ga10</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>ga8d9dbb1e613cfe2b119668158e35a76</anchor>
+      <anchor>ga11</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>ge303a6ed77135b691ebbfd56cb577531</anchor>
+      <anchor>ga12</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>gcf8efdb6fd9847e41c85f9491a252f01</anchor>
+      <anchor>ga13</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>g335e7eb264fa22343765146fb2318b31</anchor>
+      <anchor>ga14</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>g3164aa99994dabb561d6c295eb647123</anchor>
+      <anchor>ga15</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>g087136342c500c138d73dbe0e2aad11a</anchor>
+      <anchor>ga16</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>g5d675ab9877df60ec467a20a0d62fcbc</anchor>
+      <anchor>ga17</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>gd3fbd778898c2b0fba19d0937fb939f5</anchor>
+      <anchor>ga18</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>gaa76e04fcde3aa6c162fb9d2fcaca251</anchor>
+      <anchor>ga19</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>gcda38fc8e26a75c2b5d246b4341a8fd3</anchor>
+      <anchor>ga20</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>gdbdd8bad1742e87b5c5a299c2ebf7cf4</anchor>
+      <anchor>ga21</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>g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1</anchor>
+      <anchor>ga22</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>g68110f6d19b3987f6f66baee3926eb89</anchor>
+      <anchor>ga23</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>g7623276e130cb684670ecb153300ebaf</anchor>
+      <anchor>ga24</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>g751759cdeb8feb061c00f35d37fea45c</anchor>
+      <anchor>ga25</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>gea14f3cad139fc5b8d547a252deacff3</anchor>
+      <anchor>ga26</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>g775714bf75f1fdbdd895f59edc9eca55</anchor>
+      <anchor>ga27</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>g94d8cf912e3b036f67bc2d4c37d733ff</anchor>
+      <anchor>ga28</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>g30d5438686c8ead9a092f98bf3c3d8ca</anchor>
+      <anchor>ga29</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>g095834813ebbe8985d443e1fa78a0b98</anchor>
+      <anchor>ga30</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>ge89d8eb48e4a7a8107b87a44a4318064</anchor>
+      <anchor>ga31</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>g9fe5b4efdfaa3e79918dd5079e61e2c5</anchor>
+      <anchor>ga32</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>g8fef23ae01a368f4d16ad95813d97d6d</anchor>
+      <anchor>ga33</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>g54e35f94578f346c07718587f18b049c</anchor>
+      <anchor>ga34</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>g7a006418c4dbb265be71f7b5a202455d</anchor>
+      <anchor>ga35</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>ge66b9c64f5821ee6e95f4b9e18cadd4e</anchor>
+      <anchor>ga36</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>gc970fc314c6418d9193d93c787b908d9</anchor>
+      <anchor>ga37</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>g955b215a88b868cfc74d7a340de9b8f6</anchor>
+      <anchor>ga38</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>gf69f651a798e9f06c67baf06f0754228</anchor>
+      <anchor>ga39</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>g3dea1f995d40482b9f6470fedd994f95</anchor>
+      <anchor>ga40</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>g96fc73864dfc00ae418f14a81c72be26</anchor>
+      <anchor>ga41</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>gd0f6c2b153638f551d7709780eb7276a</anchor>
+      <anchor>ga42</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>g3c1ddd3c10c367c0912fdd841576278f</anchor>
+      <anchor>ga43</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_add_param</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga8dc4ff543dbc1882d673b25234088b6</anchor>
+      <anchor>ga44</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>g62c6225b0721d5c80d889edc307f0b6b</anchor>
+      <anchor>ga45</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>gf8aa1d7aba11de5fdee95b9cb339be61</anchor>
+      <anchor>ga46</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>ged453c314365a3948b195e3175455a12</anchor>
+      <anchor>ga47</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>gc5a3eb0348d31acf60772265c3896542</anchor>
+      <anchor>ga48</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>g711cf3e5e52fd3434ef7a9d16654aea8</anchor>
+      <anchor>ga49</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>g22338d64a871a8b279fdee6fd83fff7f</anchor>
+      <anchor>ga50</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>g5182246d4e0653f73dfaa40b62d4285f</anchor>
+      <anchor>ga51</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>g8134e4dc36b063a7d7dd229b9df32726</anchor>
+      <anchor>ga52</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>g6e6c5474c253a452073eba25251a1481</anchor>
+      <anchor>ga53</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>g82f7bbcf639c60678c1dc2aee24e8a24</anchor>
+      <anchor>ga54</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>g8c6cd5f3bb3ab59a4f06c020c062c13e</anchor>
+      <anchor>ga55</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>g778b0e43aad1e011012b8071b469c694</anchor>
+      <anchor>ga56</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>g8f67ed7dcee969e77374fb4daf468d58</anchor>
+      <anchor>ga57</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>g5f4adaadb80cd2d94569881d96cfa02e</anchor>
+      <anchor>ga58</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>g1f63514f8ffd8ea56f0beee69398ee01</anchor>
+      <anchor>ga59</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>gd40038a74fa7548da5fcaec6687c8787</anchor>
+      <anchor>ga60</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>gec605c647cab13d61ab5e2822d9f7ead</anchor>
+      <anchor>ga61</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>g71306c3e3118d9a4545b0a3cefb863ea</anchor>
+      <anchor>ga62</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>g65b18994af3384af04e2bf77e288f54f</anchor>
+      <anchor>ga63</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>gae28e4c640fba005a72e92af66327b50</anchor>
+      <anchor>ga64</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>gdeae102d1bd65147221f56e6095f35ef</anchor>
+      <anchor>ga65</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>g59b79c779211a72de534fb9e61548f97</anchor>
+      <anchor>ga66</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>gbf1d9c938d364598414e9f15c41c1f08</anchor>
+      <anchor>ga67</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>g18b8a4fb414245d2c30df9ee11057845</anchor>
+      <anchor>ga68</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>gd286782f691998858e30a202506bad74</anchor>
+      <anchor>ga69</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>gdd7769bfece8597cde869eced1239a1e</anchor>
+      <anchor>ga70</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>ga1620e4be3c7fb85262802338d3143f6</anchor>
+      <anchor>ga71</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>gf95184ecee86a92db2a7d3f050154a46</anchor>
+      <anchor>ga72</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>ga59b141facb320c409d9071f469fdbc5</anchor>
+      <anchor>ga73</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>g5efb45e6883a2522fd7e78c6eb761c79</anchor>
+      <anchor>ga74</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>g46195f69cc57bd18a4cde5756dd84601</anchor>
+      <anchor>ga75</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>g22bc2b8307fb6a95dac7fcf3d35bf6b9</anchor>
+      <anchor>ga76</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>gb4121cba599314c929d04cce0e850473</anchor>
+      <anchor>ga77</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>g4cc8b69619067f882035cca46e9ce0cd</anchor>
+      <anchor>ga78</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>g1a5a2746548465d681d00c6301a26100</anchor>
+      <anchor>ga79</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>gb918206f9b70fff5d58a16a762295981</anchor>
+      <anchor>ga80</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>g9f4db93fc31ad52018bc3ad14b58bfc2</anchor>
+      <anchor>ga81</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>gc7fe8cd335309d755fe5b54bf6b8e5a3</anchor>
+      <anchor>ga82</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>g7acde85eb361525f5cf481bafddbc1bd</anchor>
+      <anchor>ga83</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>g740a5cab681f30b8cc5e4ca18197e472</anchor>
+      <anchor>ga84</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>g4841e9250e4c7f38f2267355402ffcc1</anchor>
+      <anchor>ga85</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>g28203d9250f232f9af290802cf2db881</anchor>
+      <anchor>ga86</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>ge5b7e3356b3c1c893620fdeeea486e48</anchor>
+      <anchor>ga87</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>g9e992f880bd74cd4097527a39aea7125</anchor>
+      <anchor>ga88</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>gb9df68cbf9973203adfca5e1293b300a</anchor>
+      <anchor>ga89</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>ga79b051578077beca548be224062705c</anchor>
+      <anchor>ga90</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>g44793f2cf64b11917b8943d20ee43b9d</anchor>
+      <anchor>ga91</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>g8c04ab4487623a41e0b2600d466a88ad</anchor>
+      <anchor>ga92</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>g38a95079fd6f90a0c6a92c5ddeb104ca</anchor>
+      <anchor>ga93</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>g1c724bc85737bf8c698a08bc2d441b3e</anchor>
+      <anchor>ga94</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>g6fa1953ee96051566a261f3391da3857</anchor>
+      <anchor>ga95</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>ge12a7edf773cbe04fb98b171ba2c2fb9</anchor>
+      <anchor>ga96</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>g160150a3a39d66f5a807d1c750a57890</anchor>
+      <anchor>ga97</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>gf2aada3c00f9b00bc6a65014da87e250</anchor>
+      <anchor>ga98</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>g9fe388535a67f8360ab21f58233c0e17</anchor>
+      <anchor>ga99</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>gae6b21f76f675516e9189c47444e17cf</anchor>
+      <anchor>ga100</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>gb411dae8fb16ec9f289d4f2f1ecabcfc</anchor>
+      <anchor>ga101</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>g2deea3612965e28cd0d513c5850ca074</anchor>
+      <anchor>ga102</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>g056b021334fe812aa14bbbfd60aafba8</anchor>
+      <anchor>ga103</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>gcdfa2f747081721c03b10484a832a535</anchor>
+      <anchor>ga104</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>gadfd66825dd58fb8e0851d493445c4e4</anchor>
+      <anchor>ga105</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>geecfc1f1fdc97ea165ae35b64de95178</anchor>
+      <anchor>ga106</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>gdf6c305c48d012bc138db025c9bd63df</anchor>
+      <anchor>ga107</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>g5bd30b408d6ec16b3999dce5e540a5fa</anchor>
+      <anchor>ga108</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>gda8dd20ab17a9b403c68b4cd86fb529c</anchor>
+      <anchor>ga109</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>g0f09e85b570ffee4a4d94853bb22bcb3</anchor>
+      <anchor>ga110</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>g28d01beda4b54cec395654847dbbc301</anchor>
+      <anchor>ga111</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>gac76d8e06c3ce3fb0f27c0c80d6ad5fc</anchor>
+      <anchor>ga112</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>g8125d08f90002e654f2e45427e2f0251</anchor>
+      <anchor>ga113</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>g361d0ba27ad2ec9e99e5eec05f2e76a6</anchor>
+      <anchor>ga114</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>gb686075ecbdf349387c356826b432191</anchor>
+      <anchor>ga115</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>g64e5f74483ffb7bd4412f4eefeb22250</anchor>
+      <anchor>ga116</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>g57abcfb2fa58e743f9d30f579481845a</anchor>
+      <anchor>ga117</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>ge690d9171bcdb0fedf981804bb923fac</anchor>
+      <anchor>ga118</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>gebcb03afca6bb0d94e71bdf570d09af9</anchor>
+      <anchor>ga119</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>gf2c1a37f8d837fae61bb18de1cd7bdc3</anchor>
+      <anchor>ga120</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>g5735451225c2a355cb11c165e011637d</anchor>
+      <anchor>ga121</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>ge28b0d78641811b1625a52971a2d11fa</anchor>
+      <anchor>ga122</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>g9f897908b19f5f0cdaf75b483d46e041</anchor>
+      <anchor>ga123</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_allocate_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>geb61df54d59bfebdcb77b1e5e993ebaa</anchor>
+      <anchor>ga124</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>g089f9a34f26f700f43858ba3959d8f13</anchor>
+      <anchor>ga125</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>g8eea0724106ea7174b808026ae8d1a5c</anchor>
+      <anchor>ga126</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>gf64e586fca554f2dd65157a76eaad34a</anchor>
+      <anchor>ga127</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>ga1b826f02f84aa038c6862575770b629</anchor>
+      <anchor>ga128</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>g8a2924dd6393431e994d22c704ec25fc</anchor>
+      <anchor>ga129</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>gbd8b19b70d2f2fc7dcd7c896b3ed5d98</anchor>
+      <anchor>ga130</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>g6a08746f33133e8873236b35eb1e7a62</anchor>
+      <anchor>ga131</anchor>
       <arglist>(stp_parameter_t *desc, const stp_parameter_t *param)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>weave.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>46ee59dd8e65c35e69ba8cfa94e90786</anchor>
+      <anchor>a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>int</type>
       <name>stp_packfunc</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>ebd02297dfdf36f818d0ff48c900f561</anchor>
+      <anchor>a1</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>910269f43cbcff87ce004bb20b659d9e</anchor>
+      <anchor>a2</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>76c426b3b4c3b2503c54f2c2a013768a</anchor>
+      <anchor>a3</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>520099a705f78fd503d204665ee21d5d</anchor>
+      <anchor>a4</anchor>
       <arglist>(stp_vars_t *v, int n)</arglist>
     </member>
     <member kind="enumeration">
       <name>stp_weave_strategy_t</name>
-      <anchor>6233c2f715aee6e6c2e9935f0e2ce027</anchor>
+      <anchor>a26</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ZIGZAG</name>
-      <anchor>6233c2f715aee6e6c2e9935f0e2ce02741a2ca9b1c97ec5a62795faf4968dcfc</anchor>
+      <anchor>a26a11</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING</name>
-      <anchor>6233c2f715aee6e6c2e9935f0e2ce027cfdbe44826dff4a2b9853b1eb39d747d</anchor>
+      <anchor>a26a12</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_DESCENDING</name>
-      <anchor>6233c2f715aee6e6c2e9935f0e2ce027c7435712ea733caf7ee62d380c0f960f</anchor>
+      <anchor>a26a13</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING_2X</name>
-      <anchor>6233c2f715aee6e6c2e9935f0e2ce027e9dd082ce13e2fd30a8fd0c8efbe1d12</anchor>
+      <anchor>a26a14</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_STAGGERED</name>
-      <anchor>6233c2f715aee6e6c2e9935f0e2ce0279aab99f511c9d24e64a229a4b309c501</anchor>
+      <anchor>a26a15</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING_3X</name>
-      <anchor>6233c2f715aee6e6c2e9935f0e2ce027de577c11bb8893c274e74474a4fa208b</anchor>
+      <anchor>a26a16</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_initialize_weave</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>9b72df98be9b9e25b42aca6ef5901d35</anchor>
+      <anchor>a17</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>5b0aac599abc4859e2d208db7185cdbf</anchor>
+      <anchor>a18</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>b021ec20fafa48e57495123df1533b62</anchor>
+      <anchor>a19</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>816c57bb673bebebaa42576b3e452206</anchor>
+      <anchor>a20</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>14c1a0f43a0353f7771632d3a0356cea</anchor>
+      <anchor>a21</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>46dacaec8d953a33f6c15299f3a91046</anchor>
+      <anchor>a22</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>207eac262dceb86f20fe32b048b257ad</anchor>
+      <anchor>a23</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>129f77403ade9f504dd38185a7ab6209</anchor>
+      <anchor>a24</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>3dbb20fd24c73c2982819b1f184b7ee3</anchor>
+      <anchor>a25</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>27cae2ded3a9434dd6f332dbf6721f71</anchor>
+      <anchor>a5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_packfunc</type>
       <name>stp_pack_uncompressed</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>b81173e35f655b1a8f0047cbadce5391</anchor>
+      <anchor>a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_fillfunc</type>
       <name>stp_fill_tiff</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>6c47bead0399664b9041a6d5687b091e</anchor>
+      <anchor>a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_fillfunc</type>
       <name>stp_fill_uncompressed</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>fb161f053574d9cd4a47b613b614b0f3</anchor>
+      <anchor>a8</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>a6df061ed81c1a6ecb8854b6eab4e276</anchor>
+      <anchor>a9</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>f6c7a76f229fdc0be020a53a15a4a5f5</anchor>
+      <anchor>a10</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>xml.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>ec3dca5a8c562175532452b7a055200f</anchor>
+      <anchor>a0</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>3258e11973b45c04e9ec1810789cface</anchor>
+      <anchor>a1</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>bdff70654d8ca31445e0957cfad68816</anchor>
+      <anchor>a2</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>0377f341fce4c764d695b851cf90125c</anchor>
+      <anchor>a3</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>f9605dfeaf5ba8c41b42aba2c09b4f20</anchor>
+      <anchor>a4</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>9e2620e798edcd889cd80454374a0a1d</anchor>
+      <anchor>a5</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_xml_parse_file</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>477e8c523df78a068e98be5e929d6825</anchor>
+      <anchor>a6</anchor>
       <arglist>(const char *file)</arglist>
     </member>
     <member kind="function">
       <type>long</type>
       <name>stp_xmlstrtol</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>56885d576d38f8fbffce10834e892117</anchor>
+      <anchor>a7</anchor>
       <arglist>(const char *value)</arglist>
     </member>
     <member kind="function">
       <type>unsigned long</type>
       <name>stp_xmlstrtoul</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>9d7f6cba6d4f5b8b01b6d3c192d10596</anchor>
+      <anchor>a8</anchor>
       <arglist>(const char *value)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_xmlstrtod</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>666632a9a3cb7f802fd5478d68d57166</anchor>
+      <anchor>a9</anchor>
       <arglist>(const char *textval)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_init</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>e279cdb2639cb00884563204c586e34a</anchor>
+      <anchor>a10</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_exit</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>d35445001b4f0ff02b45cf411b056cb2</anchor>
+      <anchor>a11</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>acec0c2b6d806a70b74c2c9efb5ca895</anchor>
+      <anchor>a12</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>d698808efae24e1f0002243256171fc0</anchor>
+      <anchor>a13</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_preinit</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>e2aeb50ec9bffd4cc7ff4b8756ce503a</anchor>
+      <anchor>a14</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>174add090763cd3d8a019da75257e9c5</anchor>
+      <anchor>a15</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>134d8ffe83aa1bc29ca65869af337479</anchor>
+      <anchor>a16</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>4b39835d489b183bdf939551f7b6871b</anchor>
+      <anchor>a17</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>286050c77ae8ee255a7b6035b88d5fb4</anchor>
+      <anchor>a18</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>301d2355b8bb9986a7bc4f84cc6c9d40</anchor>
+      <anchor>a19</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>90e7cdadf10d6492082fd008b79853b0</anchor>
+      <anchor>a20</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>2ff6722b18cd21c91e60e7ef1cedc0d4</anchor>
+      <anchor>a21</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>593616de15330c0fb2d55e55410bf994</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>exp</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>b0ab0254bd58eb87eaee3172ba49fefb</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>x_size</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>f0ed41c0ec21ebf3f06c1a1ec9d04456</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y_size</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>6f8a30ff8882b910eb6092965bff1166</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>total_size</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>2cd6b347ff013dd494370a9938344885</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>last_x</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>94f66fddf2c8dd22340220c82f6115fd</anchor>
+      <anchor>o5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>last_x_mod</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>f1cbd20a4cb7668e3b450ae3c7879fb2</anchor>
+      <anchor>o6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>last_y</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>dcf093deead926d5e89cdf4cf72068cf</anchor>
+      <anchor>o7</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>last_y_mod</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>ea9a91cee135cee3ba2750f2875cf610</anchor>
+      <anchor>o8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>index</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>6a992d5529f459a44fee58c733255e86</anchor>
+      <anchor>o9</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>i_own</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>618931f210c709ac7c0a44ed090aef93</anchor>
+      <anchor>o10</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>x_offset</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>80997876f6afba983eaec918e58ecc0d</anchor>
+      <anchor>o11</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y_offset</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>6055652d6d84e1c46e19438c923113ff</anchor>
+      <anchor>o12</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>fast_mask</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>31acd511b5ec97637395c849e2089e00</anchor>
+      <anchor>o13</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned *</type>
       <name>matrix</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>21b72c0b7adc5c7b4a50ffcb90d92dd6</anchor>
+      <anchor>o14</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>4efa264f5ef3e1a5c95736e07544ebf0</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const double *</type>
       <name>d_cache</name>
       <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>f7e3e9aa11a7dd4199647af2e87a3bab</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned short *</type>
       <name>s_cache</name>
       <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>9c9886e8af38f75727d2b354afa8f218</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>size_t</type>
       <name>count</name>
       <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>e2942a04780e223b215eb8b663cf5353</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4746,21 +4746,21 @@
       <type>const char *</type>
       <name>short_name</name>
       <anchorfile>structstp__color.html</anchorfile>
-      <anchor>4698bac7fdbf14511adbe13aeefe80b8</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>long_name</name>
       <anchorfile>structstp__color.html</anchorfile>
-      <anchor>2fc6351aa4209f68fb16e85c6104f96c</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const stp_colorfuncs_t *</type>
       <name>colorfuncs</name>
       <anchorfile>structstp__color.html</anchorfile>
-      <anchor>a3f019e45920da0adf4ce2eec4cc2e7c</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4771,28 +4771,28 @@
       <type>int(*</type>
       <name>init</name>
       <anchorfile>structstp__colorfuncs__t.html</anchorfile>
-      <anchor>5aafc0d83b487b1d0a8db5c1f1cd227d</anchor>
+      <anchor>o0</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>structstp__colorfuncs__t.html</anchorfile>
-      <anchor>1130ff4ca5f70a5f951b69fa41ef8016</anchor>
+      <anchor>o1</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>structstp__colorfuncs__t.html</anchorfile>
-      <anchor>54879ee9c7f05b72f24bab4bce932970</anchor>
+      <anchor>o2</anchor>
       <arglist>)(const stp_vars_t *v)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>describe_parameter</name>
       <anchorfile>structstp__colorfuncs__t.html</anchorfile>
-      <anchor>358435dd7c4c3dba226ba7016dba0cad</anchor>
+      <anchor>o3</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>9dd4e461268c8034f5c8564e155c67a6</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>y</name>
       <anchorfile>structstp__curve__point__t.html</anchorfile>
-      <anchor>415290769594460e2e485922904f345d</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4821,35 +4821,35 @@
       <type>int</type>
       <name>x</name>
       <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
       <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>415290769594460e2e485922904f345d</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
       <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
       <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>aa3d9d64037ca4cdd2a4d871d673bd73</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const void *</type>
       <name>data</name>
       <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>8d777f385d3dfec8815d20f7496026dc</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4860,35 +4860,35 @@
       <type>int</type>
       <name>x</name>
       <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
       <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>415290769594460e2e485922904f345d</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
       <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
       <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>aa3d9d64037ca4cdd2a4d871d673bd73</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned *</type>
       <name>data</name>
       <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>8d777f385d3dfec8815d20f7496026dc</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4899,35 +4899,35 @@
       <type>int</type>
       <name>x</name>
       <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
       <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>415290769594460e2e485922904f345d</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
       <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
       <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>aa3d9d64037ca4cdd2a4d871d673bd73</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned short *</type>
       <name>data</name>
       <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>8d777f385d3dfec8815d20f7496026dc</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4938,32 +4938,32 @@
       <type>unsigned</type>
       <name>bit_pattern</name>
       <anchorfile>structstp__dotsize.html</anchorfile>
-      <anchor>67b7bfbc0ce2bbedbf5837e91f8773cd</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>value</name>
       <anchorfile>structstp__dotsize.html</anchorfile>
-      <anchor>2063c1608d6e0baf80249c42e2be5804</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
     <name>stp_double_bound_t</name>
     <filename>structstp__double__bound__t.html</filename>
-    <member kind="typedef">
+    <member kind="variable">
       <type>double</type>
       <name>lower</name>
       <anchorfile>structstp__double__bound__t.html</anchorfile>
-      <anchor>81e073b428b50247daba38531dcf412a</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>double</type>
       <name>upper</name>
       <anchorfile>structstp__double__bound__t.html</anchorfile>
-      <anchor>0122b4c2c01ee1c698ecc309d2b8eb5a</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4974,14 +4974,14 @@
       <type>const stp_printfuncs_t *</type>
       <name>printfuncs</name>
       <anchorfile>structstp__family.html</anchorfile>
-      <anchor>c0c2f50561daa16ae61c455b0861718a</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_list_t *</type>
       <name>printer_list</name>
       <anchorfile>structstp__family.html</anchorfile>
-      <anchor>505045dc6abce739a39cbc650ad05535</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4992,74 +4992,74 @@
       <type>void(*</type>
       <name>init</name>
       <anchorfile>structstp__image.html</anchorfile>
-      <anchor>9aebe24f43e2fe0d4342495a64026baa</anchor>
+      <anchor>o0</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>reset</name>
       <anchorfile>structstp__image.html</anchorfile>
-      <anchor>edae63ed1524916fdef45cb652d7275e</anchor>
+      <anchor>o1</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>width</name>
       <anchorfile>structstp__image.html</anchorfile>
-      <anchor>85ce2739e10b7c073f108a82b3e5d717</anchor>
+      <anchor>o2</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>height</name>
       <anchorfile>structstp__image.html</anchorfile>
-      <anchor>36cffb4418960b12743fc547902e35a6</anchor>
+      <anchor>o3</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>stp_image_status_t(*</type>
       <name>get_row</name>
       <anchorfile>structstp__image.html</anchorfile>
-      <anchor>e2681945ea918b7082ba78751d084347</anchor>
+      <anchor>o4</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>structstp__image.html</anchorfile>
-      <anchor>e9495dba1df955709ebbd651c1a526e6</anchor>
+      <anchor>o5</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>conclude</name>
       <anchorfile>structstp__image.html</anchorfile>
-      <anchor>6af9f0bf8a602f4a937c6e207a03ec01</anchor>
+      <anchor>o6</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>rep</name>
       <anchorfile>structstp__image.html</anchorfile>
-      <anchor>75a384057459ae8e69fb9a98a249b4f4</anchor>
+      <anchor>o7</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
     <name>stp_int_bound_t</name>
     <filename>structstp__int__bound__t.html</filename>
-    <member kind="typedef">
+    <member kind="variable">
       <type>int</type>
       <name>lower</name>
       <anchorfile>structstp__int__bound__t.html</anchorfile>
-      <anchor>81e073b428b50247daba38531dcf412a</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>int</type>
       <name>upper</name>
       <anchorfile>structstp__int__bound__t.html</anchorfile>
-      <anchor>0122b4c2c01ee1c698ecc309d2b8eb5a</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5070,14 +5070,14 @@
       <type>int</type>
       <name>ncolors</name>
       <anchorfile>structstp__lineactive__t.html</anchorfile>
-      <anchor>7e65a932280df4e01f60294f031fb97e</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>v</name>
       <anchorfile>structstp__lineactive__t.html</anchorfile>
-      <anchor>9e3669d19b675bd57058fd4664205d2a</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5088,21 +5088,21 @@
       <type>int</type>
       <name>ncolors</name>
       <anchorfile>structstp__linebounds__t.html</anchorfile>
-      <anchor>7e65a932280df4e01f60294f031fb97e</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int *</type>
       <name>start_pos</name>
       <anchorfile>structstp__linebounds__t.html</anchorfile>
-      <anchor>8fb0bcdadf14357992c7faea15fb9497</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int *</type>
       <name>end_pos</name>
       <anchorfile>structstp__linebounds__t.html</anchorfile>
-      <anchor>1f90fb291292e9a933aa6aac4a9c857e</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5113,14 +5113,14 @@
       <type>int</type>
       <name>ncolors</name>
       <anchorfile>structstp__linebufs__t.html</anchorfile>
-      <anchor>7e65a932280df4e01f60294f031fb97e</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned char **</type>
       <name>v</name>
       <anchorfile>structstp__linebufs__t.html</anchorfile>
-      <anchor>9e3669d19b675bd57058fd4664205d2a</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5131,14 +5131,14 @@
       <type>int</type>
       <name>ncolors</name>
       <anchorfile>structstp__linecount__t.html</anchorfile>
-      <anchor>7e65a932280df4e01f60294f031fb97e</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int *</type>
       <name>v</name>
       <anchorfile>structstp__linecount__t.html</anchorfile>
-      <anchor>9e3669d19b675bd57058fd4664205d2a</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5149,14 +5149,14 @@
       <type>int</type>
       <name>ncolors</name>
       <anchorfile>structstp__lineoff__t.html</anchorfile>
-      <anchor>7e65a932280df4e01f60294f031fb97e</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned long *</type>
       <name>v</name>
       <anchorfile>structstp__lineoff__t.html</anchorfile>
-      <anchor>9e3669d19b675bd57058fd4664205d2a</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5167,56 +5167,56 @@
       <type>const char *</type>
       <name>name</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>version</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>2af72f100c356273d46284f6fd1dfc08</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>comment</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>06d4cd63bde972fc66a0aed41d2f5c51</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_module_class_t</type>
       <name>class</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>a2f2ed4f8ebc2cbb4c21a29dc40ab61d</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>handle</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>e1260894f59eeae98c8440899de4df8d</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>init</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>e410d3c31d3473619bad7812df075dd9</anchor>
+      <anchor>o5</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>fini</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>b5296150c31e6581161fc46595a06b78</anchor>
+      <anchor>o6</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>syms</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>928a1fa51ea5f2eaae90429c74743ced</anchor>
+      <anchor>o7</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5227,14 +5227,14 @@
       <type>int</type>
       <name>major</name>
       <anchorfile>structstp__module__version.html</anchorfile>
-      <anchor>f1425da40a9f2d21ab702a1c7feae026</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>minor</name>
       <anchorfile>structstp__module__version.html</anchorfile>
-      <anchor>ab846c0e3717a3e7d14af45cab70b44a</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5245,14 +5245,14 @@
       <type>char *</type>
       <name>name</name>
       <anchorfile>structstp__mxml__attr__s.html</anchorfile>
-      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>value</name>
       <anchorfile>structstp__mxml__attr__s.html</anchorfile>
-      <anchor>2063c1608d6e0baf80249c42e2be5804</anchor>
+      <anchor>o1</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>599dcce2998a6b40b1e38e8c6006cb0a</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_node_t *</type>
       <name>next</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>d0cab90d8d20d57e2f2b9be52f7dd25d</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_node_t *</type>
       <name>prev</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>fcb08b164ac83e09964deb24f2d2e80b</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_node_t *</type>
       <name>parent</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>d0e45878043844ffc41aac437e86b602</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_node_t *</type>
       <name>child</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>1b7d5726533ab525a8760351e9b5e415</anchor>
+      <anchor>o4</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>683657fb65ef37f597bddef3847a3eff</anchor>
+      <anchor>o5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_value_t</type>
       <name>value</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>2063c1608d6e0baf80249c42e2be5804</anchor>
+      <anchor>o6</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5316,14 +5316,14 @@
       <type>int</type>
       <name>whitespace</name>
       <anchorfile>structstp__mxml__text__s.html</anchorfile>
-      <anchor>67b8601a11e47a9ee3bf08ddfd0b79ba</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>string</name>
       <anchorfile>structstp__mxml__text__s.html</anchorfile>
-      <anchor>b45cffe084dd3d20d928bee85e7b0f21</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5334,21 +5334,21 @@
       <type>char *</type>
       <name>name</name>
       <anchorfile>structstp__mxml__value__s.html</anchorfile>
-      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>num_attrs</name>
       <anchorfile>structstp__mxml__value__s.html</anchorfile>
-      <anchor>30f1579a824317cbe2b6837454cd0ef1</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_attr_t *</type>
       <name>attrs</name>
       <anchorfile>structstp__mxml__value__s.html</anchorfile>
-      <anchor>425ce871530e0633c917f98d8e9b1bc7</anchor>
+      <anchor>o2</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>8e2dcfd7e7e24b1ca76c1193f645902b</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>integer</name>
       <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>157db7df530023575515d366c9b672e8</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>opaque</name>
       <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>94619f8a70068b2591c2eed622525b0e</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>real</name>
       <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>4bca24304861acde5770fdbe3cc2503b</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_text_t</type>
       <name>text</name>
       <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5398,70 +5398,70 @@
       <type>char *</type>
       <name>name</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>text</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>comment</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>06d4cd63bde972fc66a0aed41d2f5c51</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>width</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>eaae26a6fb20ed3ef54fb23bfa0b1fcc</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>height</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>b435e227d5dd201e1768b2bcb2e0aa81</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>top</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>b28354b543375bfa94dabaeda722927f</anchor>
+      <anchor>o5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>left</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>811882fecd5c7618d7099ebbd39ea254</anchor>
+      <anchor>o6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>bottom</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>71f262d796bed1ab30e8a2d5a8ddee6f</anchor>
+      <anchor>o7</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>right</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>7c4f29407893c334a6cb7a87bf045c0d</anchor>
+      <anchor>o8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_papersize_unit_t</type>
       <name>paper_unit</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>00a9745ae8b0126b5763ba88daba837b</anchor>
+      <anchor>o9</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5472,207 +5472,207 @@
       <type>const char *</type>
       <name>name</name>
       <anchorfile>structstp__param__string__t.html</anchorfile>
-      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>text</name>
       <anchorfile>structstp__param__string__t.html</anchorfile>
-      <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
     <name>stp_parameter_t</name>
     <filename>structstp__parameter__t.html</filename>
-    <member kind="typedef">
+    <member kind="variable">
       <type>const char *</type>
       <name>name</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>const char *</type>
       <name>text</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>const char *</type>
       <name>category</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>c4ef352f74e502ef5e7bc98e6f4e493d</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>const char *</type>
       <name>help</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>657f8b8da628ef83cf69101b6817150a</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>stp_parameter_type_t</type>
       <name>p_type</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>ee532d298de9538e682d9a1eaea12378</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>stp_parameter_class_t</type>
       <name>p_class</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>8112bb5792909f9417d1f6d2ab36863a</anchor>
+      <anchor>o5</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>stp_parameter_level_t</type>
       <name>p_level</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>c52b547d5a185fa1e792e175f90d24fc</anchor>
+      <anchor>o6</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>unsigned char</type>
       <name>is_mandatory</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>c261f1bf67a23fb36eadbb2c644c162f</anchor>
+      <anchor>o7</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>unsigned char</type>
       <name>is_active</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>4264c638e0098acb172519b0436db099</anchor>
+      <anchor>o8</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>unsigned char</type>
       <name>channel</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>c485d2ed5cc4ce64fcccca710c7a0bb7</anchor>
+      <anchor>o9</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>unsigned char</type>
       <name>verify_this_parameter</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>f07c856ac0ac425e65f87fff7a12b34d</anchor>
+      <anchor>o10</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>unsigned char</type>
       <name>read_only</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>befe72871b2de8f4f0e20108517e31fe</anchor>
+      <anchor>o11</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_parameter_t::@0</type>
       <name>bounds</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>eb49194cccc646fc8e93a368301834ea</anchor>
+      <anchor>o18</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>4efa264f5ef3e1a5c95736e07544ebf0</anchor>
+      <anchor>o0</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>365b8373d0bf6dc9e3450af670cc1d35</anchor>
+      <anchor>o1</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>157db7df530023575515d366c9b672e8</anchor>
+      <anchor>o2</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>c4cf4802b30127a6ae42a1a1798c51b3</anchor>
+      <anchor>o3</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>341be97d9aff90c9978347f66f945b77</anchor>
+      <anchor>o4</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>f1f713c9e000f5d3f280adbd124df4f5</anchor>
+      <anchor>o5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_parameter_t::@1</type>
       <name>deflt</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>1ae03ed771e3171fae03ed917b22ceff</anchor>
+      <anchor>o26</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>4efa264f5ef3e1a5c95736e07544ebf0</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>dbl</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>365b8373d0bf6dc9e3450af670cc1d35</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>dimension</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>c4cf4802b30127a6ae42a1a1798c51b3</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>integer</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>157db7df530023575515d366c9b672e8</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>boolean</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>84e2c64f38f78ba3ea5c905ab5a2da27</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>str</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>341be97d9aff90c9978347f66f945b77</anchor>
+      <anchor>o5</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>f1f713c9e000f5d3f280adbd124df4f5</anchor>
+      <anchor>o6</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5683,42 +5683,42 @@
       <type>int</type>
       <name>pass</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>1a1dc91c907325c69271ddf0c944bc72</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>missingstartrows</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>6b75dc88fe75f396206e0c5862d61543</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>logicalpassstart</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>da94ad894675e9119f2c647a94e21605</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>physpassstart</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>13436ac9693968e5601e30fd01451a02</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>physpassend</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>102875318f07394cc762ba839e0b5231</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>subpass</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>769ff675e6c6adb86faf4316c1aa0ba3</anchor>
+      <anchor>o5</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>54879ee9c7f05b72f24bab4bce932970</anchor>
+      <anchor>o0</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>622ce298c6fc93028618fed494c284e9</anchor>
+      <anchor>o1</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>0893788b2db9b714e8185a0d5bc54c65</anchor>
+      <anchor>o2</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>d910d40510a98935f74705e1e0c53b6d</anchor>
+      <anchor>o3</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>6e40367cc4c593d8c68138abdc46e4ef</anchor>
+      <anchor>o4</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>4ba23f8d414bf8d9305fe670b5e7ae94</anchor>
+      <anchor>o5</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>b11ae31fa8984f09a03acc5d284f53f8</anchor>
+      <anchor>o6</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>92224ef5b74a148faa0459a1ff6edd6c</anchor>
+      <anchor>o7</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>7cc301b263aa0c00e3b8d67b79b9949e</anchor>
+      <anchor>o8</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>fd889d531bf42b215023ed01d74fecab</anchor>
+      <anchor>o9</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>f553a87427ad77ead7b8e6bb7f4a2efa</anchor>
+      <anchor>o10</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="typedef">
+    <member kind="variable">
       <type>size_t</type>
       <name>bytes</name>
       <anchorfile>structstp__raw__t.html</anchorfile>
-      <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
-    <member kind="typedef">
+    <member kind="variable">
       <type>const void *</type>
       <name>data</name>
       <anchorfile>structstp__raw__t.html</anchorfile>
-      <anchor>8d777f385d3dfec8815d20f7496026dc</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5828,21 +5828,21 @@
       <type>double</type>
       <name>value</name>
       <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>2063c1608d6e0baf80249c42e2be5804</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>numsizes</name>
       <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>adae9e852b659d0d064b746f5cc85ee4</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const stp_dotsize_t *</type>
       <name>dot_sizes</name>
       <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>c4b0221c67b0895782c9c5984cc2578e</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5853,49 +5853,49 @@
       <type>int</type>
       <name>row</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>f1965a857bc285d26fe22023aa5ab50d</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>pass</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>1a1dc91c907325c69271ddf0c944bc72</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>jet</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>564f60a2dd82ea24bfa3f2f615348f7c</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>missingstartrows</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>6b75dc88fe75f396206e0c5862d61543</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>logicalpassstart</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>da94ad894675e9119f2c647a94e21605</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>physpassstart</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>13436ac9693968e5601e30fd01451a02</anchor>
+      <anchor>o5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>physpassend</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>102875318f07394cc762ba839e0b5231</anchor>
+      <anchor>o6</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5907,84 +5907,84 @@
       <type>stp_array</type>
       <name>stp_array_t</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>g69e0971771118ccea2a5dc72ba4fa73e</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>gaf63aaff6ea861e16b3addc023ef2e66</anchor>
+      <anchor>ga1</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>g562ad19d8ecc1e9bdd8c182b0a05ecec</anchor>
+      <anchor>ga2</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>gab9b031be229d8762faf46a3ef9454ec</anchor>
+      <anchor>ga3</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>g19370f7d4779013904be75bc3d97e024</anchor>
+      <anchor>ga4</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>g698e51815f2ef3fd0709d6b32a2bb921</anchor>
+      <anchor>ga5</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>g48e34b2673c2973884f0a403bafe7ea8</anchor>
+      <anchor>ga6</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>g0ca3891b4cde193cc65de63053e3f4fa</anchor>
+      <anchor>ga7</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>g9e1c46379b5935ed3a939833bd9e68be</anchor>
+      <anchor>ga8</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>g4ab405205d678a3d9ae02a98103fbfea</anchor>
+      <anchor>ga9</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>gb9d53cf70f2c892dca82b8db2414fad2</anchor>
+      <anchor>ga10</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>g2051c3f4a1eaccb198744f8d7c76d649</anchor>
+      <anchor>ga11</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
   </compound>
@@ -5998,91 +5998,91 @@
       <type>stp_color</type>
       <name>stp_color_t</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>gb711e2534c69bde47be7af3409c8ee2c</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_init</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>g835bd7024477347a46ea0c14b46996c6</anchor>
+      <anchor>ga1</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>gadf861820b3956ef7b18600dbf5da9da</anchor>
+      <anchor>ga2</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>ge2e397268288111eaffd352cb0ff1b98</anchor>
+      <anchor>ga3</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>gc47fecc2c32115494ea364e53d9f1ff2</anchor>
+      <anchor>ga4</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>ge3543409e331c5d1756c2c8fe927343b</anchor>
+      <anchor>ga5</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>g3e0f2728d47e1701c00b06199bc5512d</anchor>
+      <anchor>ga6</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>ga8b8b19da7bcc9bc814fe0f97f39b3ed</anchor>
+      <anchor>ga7</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>g25d9ee3ceee6d6e9964007ad12f9900b</anchor>
+      <anchor>ga8</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>ga5ddc4c9d02576154d0b2c6c64a6a033</anchor>
+      <anchor>ga9</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>ga92373d7aa315ab6e32a1bb0ac944b79</anchor>
+      <anchor>ga10</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>g36d2d72d2cd967405a978b76a7a8c992</anchor>
+      <anchor>ga11</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>ga0559d7812bdcbebe4edc14fc05274d9</anchor>
+      <anchor>ga12</anchor>
       <arglist>(const stp_color_t *c)</arglist>
     </member>
   </compound>
@@ -6095,399 +6095,399 @@
       <type>stp_curve</type>
       <name>stp_curve_t</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>gd5ce135b7af2c6e79bae493c7055461d</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_type_t</name>
-      <anchor>g7ced905b29f0d85de94258dceb01c3f4</anchor>
+      <anchor>ga47</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_LINEAR</name>
-      <anchor>gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff</anchor>
+      <anchor>gga47a1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_SPLINE</name>
-      <anchor>gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4</anchor>
+      <anchor>gga47a2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_wrap_mode_t</name>
-      <anchor>g1880ff988f772337e8892e791951337b</anchor>
+      <anchor>ga48</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_NONE</name>
-      <anchor>gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85</anchor>
+      <anchor>gga48a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_AROUND</name>
-      <anchor>gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2</anchor>
+      <anchor>gga48a4</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_compose_t</name>
-      <anchor>gb7d718baf4619b6be6c4aff8ce84aad9</anchor>
+      <anchor>ga49</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_ADD</name>
-      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d</anchor>
+      <anchor>gga49a5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_MULTIPLY</name>
-      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011</anchor>
+      <anchor>gga49a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_EXPONENTIATE</name>
-      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701</anchor>
+      <anchor>gga49a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_bounds_t</name>
-      <anchor>gd2b61113497bb142943d5131df3286ae</anchor>
+      <anchor>ga50</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_RESCALE</name>
-      <anchor>ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09</anchor>
+      <anchor>gga50a8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_CLIP</name>
-      <anchor>ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41</anchor>
+      <anchor>gga50a9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_ERROR</name>
-      <anchor>ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a</anchor>
+      <anchor>gga50a10</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>gf6b71d25c497e99ab2c073108b080ab6</anchor>
+      <anchor>ga1</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>ge76787e84f2fc3ba299de94f4ecc6d82</anchor>
+      <anchor>ga2</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>gfdafb0a802f00063b00713dbd6d6bfc0</anchor>
+      <anchor>ga3</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>g01bf94ed6a523f28dd909be054a69790</anchor>
+      <anchor>ga4</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>g5283a18fcc5db8e9f9384d54de50ba83</anchor>
+      <anchor>ga5</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>g4d32e3000dd3a8f258b2eab94797731b</anchor>
+      <anchor>ga6</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>gd2aade6a22b516006ce0f897c5027f35</anchor>
+      <anchor>ga7</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>gdda4313c874170e0086d2000ed04c02f</anchor>
+      <anchor>ga8</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>gaf8bad025ea7463067c9d7ab205af062</anchor>
+      <anchor>ga9</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>g48d9023f28ae2d15975002f7a9d7f94e</anchor>
+      <anchor>ga10</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>g3175711d943e95fdf363d5124237a56e</anchor>
+      <anchor>ga11</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>gca245aa6907c2fb95e150ce9a86ddb1a</anchor>
+      <anchor>ga12</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>gba540befdbd82e705358b2175d5b92e8</anchor>
+      <anchor>ga13</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>gcbd01a2662edb48af0816930b40dc8ab</anchor>
+      <anchor>ga14</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>gc0401bfefa3990ca26a0fb7718f1ebb2</anchor>
+      <anchor>ga15</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>gaf770dcae26ce48d5ee50dd8217e2c14</anchor>
+      <anchor>ga16</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>g184e0e32892aae4b2c195c6fc880bace</anchor>
+      <anchor>ga17</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>gbc9ae004e972c7d638336714f3112f9b</anchor>
+      <anchor>ga18</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>g8a215d4981a74fb2b6e4a0c381314df0</anchor>
+      <anchor>ga19</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>gd23dcc9abefca9a98b3ecd9714227093</anchor>
+      <anchor>ga20</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>g4051de3e6be42f4499de78af67288616</anchor>
+      <anchor>ga21</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>gd4cfbfbfe0c16b8f2ef4d8c44d221172</anchor>
+      <anchor>ga22</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>g0ba6753a8beeaca19719d047da25ecb5</anchor>
+      <anchor>ga23</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>g24b9486c45d68983e94dcc0fb19edacd</anchor>
+      <anchor>ga24</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>gd30e41654f1e0217aae3389b30cdffba</anchor>
+      <anchor>ga25</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>gf363a0f9686bcd6521671d531bc522d5</anchor>
+      <anchor>ga26</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>g187af251d5a89853545c8be898a00cc1</anchor>
+      <anchor>ga27</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>g3ecbc0ce98e7bd7695002306f5a2ba1b</anchor>
+      <anchor>ga28</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>g01bda0b947a6075d4a1ed373865744e6</anchor>
+      <anchor>ga29</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>gb874365285383f3eb35c1a32496a69b4</anchor>
+      <anchor>ga30</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>g60767bb2143fe4d491d351a4c0abc3b1</anchor>
+      <anchor>ga31</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>gb2312169172ec9789af9fd38279b3273</anchor>
+      <anchor>ga32</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>gee3cc69ab758b400838014df4742c28e</anchor>
+      <anchor>ga33</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>g6548b7ca6ef6ab94fe1d927c246e7baf</anchor>
+      <anchor>ga34</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>gc9786b35c2b1a55d54b62bcc57481c82</anchor>
+      <anchor>ga35</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>g9a05eae4f274f420418539cceb627556</anchor>
+      <anchor>ga36</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>gf9ff6f55ec0a0615608dc1baec6aff00</anchor>
+      <anchor>ga37</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>g0fdfc2b27a8a464584589ef38a8e05c4</anchor>
+      <anchor>ga38</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>gf68cf2508ff4a14a0dbee6fc0001667e</anchor>
+      <anchor>ga39</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>gd440d8d448173adc2be6737963a6e999</anchor>
+      <anchor>ga40</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>g6ef71ce7d92e659b1c902df29b1dcbc7</anchor>
+      <anchor>ga41</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>g21aa4497c58ebbb703dc3549560f084d</anchor>
+      <anchor>ga42</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>g650e49e1250dab5d9221ad747a627fc0</anchor>
+      <anchor>ga43</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>g6ff03fcc2a47f297c48b683884e81924</anchor>
+      <anchor>ga44</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>g60dce8c741a9b6fde73ced2134305298</anchor>
+      <anchor>ga45</anchor>
       <arglist>(const char *string)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_compose</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>g657e0ad5b93f090220d35be615fec5e4</anchor>
+      <anchor>ga46</anchor>
       <arglist>(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)</arglist>
     </member>
   </compound>
@@ -6499,49 +6499,49 @@
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor>
+      <anchor>ga0</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>geb8333d9b46653f2047c603034d26730</anchor>
+      <anchor>ga1</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor>
+      <anchor>ga2</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor>
+      <anchor>ga3</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>gcf29daa2fef5f417c57be476054c695b</anchor>
+      <anchor>ga4</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor>
+      <anchor>ga5</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor>
+      <anchor>ga6</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
@@ -6553,49 +6553,49 @@
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor>
+      <anchor>ga0</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>geb8333d9b46653f2047c603034d26730</anchor>
+      <anchor>ga1</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor>
+      <anchor>ga2</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor>
+      <anchor>ga3</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>gcf29daa2fef5f417c57be476054c695b</anchor>
+      <anchor>ga4</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor>
+      <anchor>ga5</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor>
+      <anchor>ga6</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
@@ -6607,98 +6607,98 @@
       <type>#define</type>
       <name>STP_MAJOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g98b05dcc61492d413bb01421995f1421</anchor>
+      <anchor>ga7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MINOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g26319655da45e42c3b498ae7db0bf62c</anchor>
+      <anchor>ga8</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MICRO_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g02b38fef35caed8b676941e8dd8aadae</anchor>
+      <anchor>ga9</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CURRENT_INTERFACE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g08cdc7e05ec4d52b2458470b6d0047fb</anchor>
+      <anchor>ga10</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_BINARY_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ge754fd2fde377ba0bbe61aee1a31dd9a</anchor>
+      <anchor>ga11</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_INTERFACE_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>gfd63347e8d3a71fa8384db59deabbde5</anchor>
+      <anchor>ga12</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHECK_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g26c662a55c391d11663052ca39458972</anchor>
+      <anchor>ga13</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>g888f2f6268a658d1a6b71b5288299488</anchor>
+      <anchor>ga6</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>g19a4efe48689fb8f859d04e60bfe028f</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_minor_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g66def32167cee385762282e36b60d3b7</anchor>
+      <anchor>ga1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_micro_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g24960731fb86305c31f0be5621ccb993</anchor>
+      <anchor>ga2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_current_interface</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g78c76c5831f5046eee8a56bd010b24dc</anchor>
+      <anchor>ga3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_binary_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>g97878c63aacb7d1fa8eed6cf1168c2e0</anchor>
+      <anchor>ga4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_interface_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>gf242f39e07a0ab2f2e25e1b7bc3e3aac</anchor>
+      <anchor>ga5</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -6711,78 +6711,78 @@
       <type>#define</type>
       <name>STP_CHANNEL_LIMIT</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>gf71d7111a7215d4c1f1ef1317f9d6cfc</anchor>
+      <anchor>ga8</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_image</type>
       <name>stp_image_t</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>gc5b6b70cd39959ffd06deab3724d87e9</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_image_status_t</name>
-      <anchor>g3378dd231cc63da06de0bb41f1cde78f</anchor>
+      <anchor>ga9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_OK</name>
-      <anchor>gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5</anchor>
+      <anchor>gga9a2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_ABORT</name>
-      <anchor>gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b</anchor>
+      <anchor>gga9a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_init</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>g74c2417d571861506be7209421a3b418</anchor>
+      <anchor>ga1</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>g69cd20ccb54500d0ee8cf38969db69a6</anchor>
+      <anchor>ga2</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>g9ee4915d4a1007f2d9c730ddc96d931b</anchor>
+      <anchor>ga3</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>g48a99a9a8493b75687ad0900664ca4cb</anchor>
+      <anchor>ga4</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>gfc93a7a3f6629f6826bf1f6f757f464e</anchor>
+      <anchor>ga5</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>gd36123431e93e049d813894aa039c25c</anchor>
+      <anchor>ga6</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>gd1017f2f9b91d7add73c2393d96f700a</anchor>
+      <anchor>ga7</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
   </compound>
@@ -6794,224 +6794,224 @@
       <type>stp_list_item</type>
       <name>stp_list_item_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g71c64aeca8ca0613215306f088b6a963</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_list</type>
       <name>stp_list_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g01be7c3ea8c46226978010d453016f22</anchor>
+      <anchor>ga1</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_node_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g3744d9043311d0bcbb21f80e79b9afba</anchor>
+      <anchor>ga2</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>void *(*</type>
       <name>stp_node_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g589c7c30b003d694b844834a41a6b1fa</anchor>
+      <anchor>ga3</anchor>
       <arglist>)(const void *)</arglist>
     </member>
     <member kind="typedef">
       <type>const char *(*</type>
       <name>stp_node_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g1c6584d7cf0cda45dce5d95249af6470</anchor>
+      <anchor>ga4</anchor>
       <arglist>)(const void *)</arglist>
     </member>
     <member kind="typedef">
       <type>int(*</type>
       <name>stp_node_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>gd7ac92a42bf2184103e0a83147d1835f</anchor>
+      <anchor>ga5</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>gb357e17f729e41b4f96d6aada1be26b9</anchor>
+      <anchor>ga6</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>gaf10e4bb8ce6a8b6f5f015475400eb1b</anchor>
+      <anchor>ga7</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_list_copy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>g3bd2f5a42d3313287017bfe20859c2d9</anchor>
+      <anchor>ga8</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>g1382e926901b5efa2356176826a96a1a</anchor>
+      <anchor>ga9</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>ga67c8173f8c7b2c40e3d6dde6578faec</anchor>
+      <anchor>ga10</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>g2ef0298e970fdb93955860e7ee3f878c</anchor>
+      <anchor>ga11</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>g9885458dd0f6e6fe5c88c4b2b0643e2a</anchor>
+      <anchor>ga12</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>g0fd0ea2439ab2b0c9b9fb97f14c9a470</anchor>
+      <anchor>ga13</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>gdbf12ab6f47d68f2605f211023c4f520</anchor>
+      <anchor>ga14</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>g013ca40ec7e5714fc5ee5f31ac5582bc</anchor>
+      <anchor>ga15</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>gc103cb4ff8870b3a8d90b6ebcade2498</anchor>
+      <anchor>ga16</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>g9d344e3c6874e6033f8fc71370678bcf</anchor>
+      <anchor>ga17</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>gec59dd3b87efc811ef2b6303102ed279</anchor>
+      <anchor>ga18</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>g310dd79907494b07d9005fbf50b9eb0c</anchor>
+      <anchor>ga19</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>g97d7c6d659aa7d05bc54a349a07e10c0</anchor>
+      <anchor>ga20</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>g468cc0a5dfb1bfbef9eebd8d4f644492</anchor>
+      <anchor>ga21</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>g42bdba5fcb861bdf8facb9135039d9b8</anchor>
+      <anchor>ga22</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>ga95d8ace9b6ec71388007024c51865cb</anchor>
+      <anchor>ga23</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>gbad08ce8ef257dae054ea3816ae88fe7</anchor>
+      <anchor>ga24</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>ga759fd3cb97b9f651424b8a8fb6bedaa</anchor>
+      <anchor>ga25</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>g50f49648801707436012cd5dc66b1f8c</anchor>
+      <anchor>ga26</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>gde2acf279e8ea067fdc1f3f951d0b373</anchor>
+      <anchor>ga27</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>gcee23493eafdfcfce51e2ccf29ebbf54</anchor>
+      <anchor>ga28</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>gea9c1b6daae518ebecd2981289c555f3</anchor>
+      <anchor>ga29</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>g5b7d8ffea5a806953a43aee961a60fe4</anchor>
+      <anchor>ga30</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>g1b5d2889a81d712c3ba024e53bfd0f38</anchor>
+      <anchor>ga31</anchor>
       <arglist>(stp_list_item_t *item, void *data)</arglist>
     </member>
   </compound>
@@ -7022,62 +7022,62 @@
     <class kind="struct">stp_papersize_t</class>
     <member kind="enumeration">
       <name>stp_papersize_unit_t</name>
-      <anchor>gbb66a8f6ce85d70afd9fe42472b492d8</anchor>
+      <anchor>ga5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_STANDARD</name>
-      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65</anchor>
+      <anchor>gga5a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_STANDARD</name>
-      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35</anchor>
+      <anchor>gga5a1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_EXTENDED</name>
-      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d</anchor>
+      <anchor>gga5a2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_EXTENDED</name>
-      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a</anchor>
+      <anchor>gga5a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_known_papersizes</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>g93eb4d6bc44914b3ea6b184e076a0853</anchor>
+      <anchor>ga0</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>g9d655e3de6954ad3c5933dc736d2509a</anchor>
+      <anchor>ga1</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>g0438b0e4729f37579900b591e801f8ce</anchor>
+      <anchor>ga2</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>g08bb891f58a7decfee2b073c00715993</anchor>
+      <anchor>ga3</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_default_media_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>g2fe5d85acaa4ff8b8e4ad1ff3cccb027</anchor>
+      <anchor>ga4</anchor>
       <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
   </compound>
@@ -7091,182 +7091,182 @@
       <type>stp_printer</type>
       <name>stp_printer_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>g1a68662b730d44c11de6fb8226a309f6</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_family</type>
       <name>stp_family_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>g5c0458c3c1d19474e0245c47dac29e70</anchor>
+      <anchor>ga1</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_model_count</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>gc0a8108170f5c86621de14296fd94b1e</anchor>
+      <anchor>ga2</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>g1286559c60d239563f9f15fdd27996e0</anchor>
+      <anchor>ga3</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>gc041944e528afcb9a795eb6ece3fc6ff</anchor>
+      <anchor>ga4</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>g947fa230e08f9c854ca2608e76bd0d58</anchor>
+      <anchor>ga5</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>gcb4cdcada01ff29c5fd4ffeaa576db9e</anchor>
+      <anchor>ga6</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>g6f32b0213b580bf081fc8752a3eb04a1</anchor>
+      <anchor>ga7</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>g00182878bdc39935e6382d7e41d55294</anchor>
+      <anchor>ga8</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>g6c6c426f86307660079277ab6e90ae3d</anchor>
+      <anchor>ga9</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>g9c98ccc58b2c6f9ed6bd1025220ff77d</anchor>
+      <anchor>ga10</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>gfc0382fd32b49ea9d171e4ce8b750c62</anchor>
+      <anchor>ga11</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>g7ba104f0ea5ce4a88175486894010b71</anchor>
+      <anchor>ga12</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>ge67398e65540b835f5c5d073c5ea0ec1</anchor>
+      <anchor>ga13</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>gc3d8cdb65382cb13ea6b01072e6240d5</anchor>
+      <anchor>ga14</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>g121125e6646c6f6d8965f1857450749e</anchor>
+      <anchor>ga15</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>g9cf59fba866430dd47508bac6561ef67</anchor>
+      <anchor>ga16</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>g40637834f08a166992325af09f6a6030</anchor>
+      <anchor>ga17</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>gc09e99e20c8a19a13a5fb6356742a92a</anchor>
+      <anchor>ga18</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>gd91f8e7a622725f0d47196cf912ddd8d</anchor>
+      <anchor>ga19</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>g82b22438444849bdedb4cfbe22f209e8</anchor>
+      <anchor>ga20</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>ga2ab30a5e5442b7a552fc3b884e1511b</anchor>
+      <anchor>ga21</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>gc9aba62164667822fd9f110740bab570</anchor>
+      <anchor>ga22</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>g666486047edfe4405d003b5c3bbe4b49</anchor>
+      <anchor>ga23</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>g806f00d4167762c7a3d467ec37c8430e</anchor>
+      <anchor>ga24</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>g950e2cd193926440ba250dbc184d8588</anchor>
+      <anchor>ga25</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
   </compound>
@@ -7278,203 +7278,203 @@
       <type>stp_sequence</type>
       <name>stp_sequence_t</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>gb3d4cae653c4303a6e5d26b516694c92</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>g771327bed5a71d8d33cc6b3ec5cbdbee</anchor>
+      <anchor>ga1</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_destroy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>g98c9c2859d2ebe9b1987d26b62bd6ce0</anchor>
+      <anchor>ga2</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>g5792d6f821525514199dd2d9b332ddd4</anchor>
+      <anchor>ga3</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>gd37eb66db88ac93b853ba6e02b9155bc</anchor>
+      <anchor>ga4</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>gd56df3112937c11431e033f2d9574b96</anchor>
+      <anchor>ga5</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>g392e1da122d95d6fc07b6d73eff1d311</anchor>
+      <anchor>ga6</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>gc2c70c539a3eced45be306d082faa3a6</anchor>
+      <anchor>ga7</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>g166e9a610bd53cb812e328d9e111f240</anchor>
+      <anchor>ga8</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>g99292c5ba10bcf1574c3e71a593c3e5f</anchor>
+      <anchor>ga9</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>g24024e771a50db02f2713b244212603e</anchor>
+      <anchor>ga10</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>g9b41ba7e0f1fb00cf19bbb9efe70824d</anchor>
+      <anchor>ga11</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>gc33208fae031bd1111f8ceb4c1425199</anchor>
+      <anchor>ga12</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>gf7f49101192387e29399ded6d3166d13</anchor>
+      <anchor>ga13</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>g044210129f28c298152ce124371324d4</anchor>
+      <anchor>ga14</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>g34a526cb5e72b611ac8a98b559c24e2e</anchor>
+      <anchor>ga15</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>gd15e2cf350bb311da58f4b11240fa0f2</anchor>
+      <anchor>ga16</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>gbc7ec322716d761436e4ad2d5d2f756f</anchor>
+      <anchor>ga17</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>gd4f058b2c690ad4e326970cc841d8f79</anchor>
+      <anchor>ga18</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>g40cd6256eb5bb72decd60edd1dc3be54</anchor>
+      <anchor>ga19</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>ge0d6719f863a10422dea23e7f4b4dd29</anchor>
+      <anchor>ga20</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>g68aed44bbf6ede9ac49237091f2deb43</anchor>
+      <anchor>ga21</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>gf8cd9da688af479103cf8600e48f61c9</anchor>
+      <anchor>ga22</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>g864b55caa3a8c0e573031a36f57f7cc4</anchor>
+      <anchor>ga23</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>gc4557b9fba98a7fbb4e17cc18fb0dded</anchor>
+      <anchor>ga24</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>g4396baf0d338eec6f3bce3e2000da978</anchor>
+      <anchor>ga25</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>g204f77e91c9283dc6ec6e742687bb0db</anchor>
+      <anchor>ga26</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>g91a68efd6b99150739c7706f65703a2f</anchor>
+      <anchor>ga27</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>g8bf46faeea891ac7ca699591df596bc1</anchor>
+      <anchor>ga28</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
   </compound>
@@ -7486,385 +7486,385 @@
       <type>#define</type>
       <name>STP_DBG_LUT</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g9ef88b326f83d342849fa89c33c7e4a7</anchor>
+      <anchor>ga33</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_COLORFUNC</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g3560e33ba80d2a0ceb07fe51fac845be</anchor>
+      <anchor>ga34</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_INK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g328a4b66d0767134649ce30b243931c9</anchor>
+      <anchor>ga35</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g8d8211f97675b37f18bff822757d04b3</anchor>
+      <anchor>ga36</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PCL</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g30a9efd31b78debefd550d0b337ec795</anchor>
+      <anchor>ga37</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ESCP2</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g158e1ea4acff071440681ba678b6fb0b</anchor>
+      <anchor>ga38</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CANON</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga0d6b1a8d780b3c5f970454678bc0323</anchor>
+      <anchor>ga39</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LEXMARK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gb8180ab505c2d7c5a717a53096ac770c</anchor>
+      <anchor>ga40</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_WEAVE_PARAMS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gc746369f247dc346bcbdeacb1abbdbcb</anchor>
+      <anchor>ga41</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ROWS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gb764d477ebf0db4957cc316badac70bd</anchor>
+      <anchor>ga42</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MARK_FILE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g9c8f6255efb1fcf9cd3e7a68466e44ba</anchor>
+      <anchor>ga43</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LIST</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gcb3d85de1088cf795cfeaa9e1450c4e0</anchor>
+      <anchor>ga44</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MODULE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g6d69d079a3d7a3e0e2b870e1e9417187</anchor>
+      <anchor>ga45</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PATH</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gb11ef5f0ed150be2d3b999b7fc7e4f24</anchor>
+      <anchor>ga46</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PAPER</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g08f48f3423e848f1932435c5f8e94ff7</anchor>
+      <anchor>ga47</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PRINTERS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g7bbbf3d31a1a4f6b0da808184e1c1587</anchor>
+      <anchor>ga48</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_XML</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g51aee81a3d2a33d42417f6b61bb63f5e</anchor>
+      <anchor>ga49</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_VARS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g52844a51058ca29f975b5666743622ac</anchor>
+      <anchor>ga50</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_OLYMPUS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g4dc6609c9bb0c256fec7361f41a5c45f</anchor>
+      <anchor>ga51</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g9eaf8d50f127cd4316bf68ad34092551</anchor>
+      <anchor>ga52</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE_ERRORS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gc80b8553e636ec01fe4e975d9f7668b9</anchor>
+      <anchor>ga53</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_SAFE_FREE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g44a234fbf1ab832399fc674c8cb53b1f</anchor>
+      <anchor>ga54</anchor>
       <arglist>(x)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_init</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g69354e5830712093045a4ba290a298f8</anchor>
+      <anchor>ga0</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_set_output_codeset</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gf7978ce9e414b3d8ad905ee36a51cfbd</anchor>
+      <anchor>ga1</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>g21168356d466d278f11dab2be8d0016e</anchor>
+      <anchor>ga2</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>g9b6b2745ee2d68d1ca356a79c50f0ed7</anchor>
+      <anchor>ga3</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_prune_inactive_options</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gf64336e7c536a51d0debe88f1f5ec90a</anchor>
+      <anchor>ga4</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_zprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g18aaa3874e4dd5259a4d182fa8d9c90a</anchor>
+      <anchor>ga5</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>g9135d4c8cac78593aff55b668d09b79c</anchor>
+      <anchor>ga6</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>gf07e31a63021b4d504cc5a410e1aeb08</anchor>
+      <anchor>ga7</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>g01199dc1d5a3db973d22cc9db00a4f41</anchor>
+      <anchor>ga8</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>g3c20beae37d9841e095b336d6f7dcc1d</anchor>
+      <anchor>ga9</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>g0a445c531388afa31650ef4ccdac3ae1</anchor>
+      <anchor>ga10</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>gbe0e31fbc0c4e6374903b25edc594f5e</anchor>
+      <anchor>ga11</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>g0a59761c8a4ee5f31cfb9bec2a9b00b4</anchor>
+      <anchor>ga12</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>g23ee64de1ec6ef5a4941ab80ba609840</anchor>
+      <anchor>ga13</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>g859b75eddde620338859121451096097</anchor>
+      <anchor>ga14</anchor>
       <arglist>(int ch)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_eprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g47c73485971132d9b41a33bdf572f670</anchor>
+      <anchor>ga15</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>g5f6389ed7d500f851cabe8425a158e4b</anchor>
+      <anchor>ga16</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>g6bdd7099220fe310b228dcff5159b8d9</anchor>
+      <anchor>ga17</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>g34d3ebda7c5b75ab40d1600f4d79a4be</anchor>
+      <anchor>ga18</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>g9ab4c35dd4b6e142281ff36ecedee27e</anchor>
+      <anchor>ga19</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g24e214e32810cc67c493c270a6ad83d6</anchor>
+      <anchor>ga20</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>gf7bc1bd0ff92ca0f6ba7d0eb559e1da3</anchor>
+      <anchor>ga21</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>g26a43ceec27ca34bc49f4806900b4618</anchor>
+      <anchor>ga22</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>gf39c22b74843750ca74a6caccb263c7c</anchor>
+      <anchor>ga23</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_malloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g7c76d059684ee6dc5bdc06e4b3af18ef</anchor>
+      <anchor>ga24</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_zalloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gae1d98650ef9777ae4f4b10eae60b5c9</anchor>
+      <anchor>ga25</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_realloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g908f11aeabf31c8a9621bd65d408a5fc</anchor>
+      <anchor>ga26</anchor>
       <arglist>(void *ptr, size_t)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_free</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>gabf89ff6213b9dc568fbdd1342b663ad</anchor>
+      <anchor>ga27</anchor>
       <arglist>(void *ptr)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_strlen</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g054943d301baecba82cdb78b7e454880</anchor>
+      <anchor>ga28</anchor>
       <arglist>(const char *s)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_strndup</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>g2c6b28a35780bfa7d03a2f8381ee82c2</anchor>
+      <anchor>ga29</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>g2f861f4a98ad496ca8cd995147867f32</anchor>
+      <anchor>ga30</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>g77022a2cfde3a9ba9269f1bc3726175c</anchor>
+      <anchor>ga31</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_release_version</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ged2a65d98cba1fd6d48c0cc1b611ae0f</anchor>
+      <anchor>ga32</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
@@ -7880,1101 +7880,1101 @@
       <type>stp_vars</type>
       <name>stp_vars_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gde33aeed00b53e4af71ee1f7c4326279</anchor>
+      <anchor>ga0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void *</type>
       <name>stp_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gb264246d4b7e584447b5f39ed8f7ee05</anchor>
+      <anchor>ga1</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>const void *</type>
       <name>stp_const_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g73ac4d52cb5cecbb9694e9038fb7ea82</anchor>
+      <anchor>ga2</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_outfunc_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gd11be815334025415a8e2023e0cd44c5</anchor>
+      <anchor>ga3</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>gd31fc080a2bd980c6a05a541dc1612a3</anchor>
+      <anchor>ga4</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_free_data_func_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g3f7233002f4db790a077e33c2661665c</anchor>
+      <anchor>ga5</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>stp_compdata</type>
       <name>compdata_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g9ee295029ad2d072b4099dc390359900</anchor>
+      <anchor>ga6</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_type_t</name>
-      <anchor>ge031ab2c7ff60007e284ed71a73111e5</anchor>
+      <anchor>ga132</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_STRING_LIST</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2</anchor>
+      <anchor>gga132a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INT</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4</anchor>
+      <anchor>gga132a8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_BOOLEAN</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d</anchor>
+      <anchor>gga132a9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DOUBLE</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81</anchor>
+      <anchor>gga132a10</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_CURVE</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e</anchor>
+      <anchor>gga132a11</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_FILE</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6</anchor>
+      <anchor>gga132a12</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_RAW</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372</anchor>
+      <anchor>gga132a13</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_ARRAY</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d</anchor>
+      <anchor>gga132a14</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DIMENSION</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7</anchor>
+      <anchor>gga132a15</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INVALID</name>
-      <anchor>gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576</anchor>
+      <anchor>gga132a16</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_class_t</name>
-      <anchor>g13c0565b3039fa25fd77092a578d44e9</anchor>
+      <anchor>ga133</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_FEATURE</name>
-      <anchor>gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11</anchor>
+      <anchor>gga133a17</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_OUTPUT</name>
-      <anchor>gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a</anchor>
+      <anchor>gga133a18</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_CORE</name>
-      <anchor>gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9</anchor>
+      <anchor>gga133a19</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_INVALID</name>
-      <anchor>gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606</anchor>
+      <anchor>gga133a20</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_level_t</name>
-      <anchor>gaa13470b0a857e96dbe70882b3fb8ebe</anchor>
+      <anchor>ga134</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_BASIC</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca</anchor>
+      <anchor>gga134a21</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc</anchor>
+      <anchor>gga134a22</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED1</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc</anchor>
+      <anchor>gga134a23</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED2</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8</anchor>
+      <anchor>gga134a24</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED3</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c</anchor>
+      <anchor>gga134a25</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED4</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff</anchor>
+      <anchor>gga134a26</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INTERNAL</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd</anchor>
+      <anchor>gga134a27</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_EXTERNAL</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203</anchor>
+      <anchor>gga134a28</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INVALID</name>
-      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3</anchor>
+      <anchor>gga134a29</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_activity_t</name>
-      <anchor>gb11c7af74fa0595684377cafe4d4eb53</anchor>
+      <anchor>ga135</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_INACTIVE</name>
-      <anchor>ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab</anchor>
+      <anchor>gga135a30</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_DEFAULTED</name>
-      <anchor>ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136</anchor>
+      <anchor>gga135a31</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_ACTIVE</name>
-      <anchor>ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99</anchor>
+      <anchor>gga135a32</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_verify_t</name>
-      <anchor>g1d02c21b8f025b121dd340db9adf3516</anchor>
+      <anchor>ga136</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_BAD</name>
-      <anchor>gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25</anchor>
+      <anchor>gga136a33</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_OK</name>
-      <anchor>gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333</anchor>
+      <anchor>gga136a34</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_INACTIVE</name>
-      <anchor>gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9</anchor>
+      <anchor>gga136a35</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_vars_t *</type>
       <name>stp_vars_create</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gae35d353b6f86b1cbb97bb0b271f5c9a</anchor>
+      <anchor>ga7</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_vars_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g165ae58fed1515b5466ab1b84df85a86</anchor>
+      <anchor>ga8</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>g3c6d765cc5a27b322289e9baa9d97098</anchor>
+      <anchor>ga9</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>g78259fcaa881655a07ef0b2b457bdf70</anchor>
+      <anchor>ga10</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>ga8d9dbb1e613cfe2b119668158e35a76</anchor>
+      <anchor>ga11</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>ge303a6ed77135b691ebbfd56cb577531</anchor>
+      <anchor>ga12</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>gcf8efdb6fd9847e41c85f9491a252f01</anchor>
+      <anchor>ga13</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>g335e7eb264fa22343765146fb2318b31</anchor>
+      <anchor>ga14</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>g3164aa99994dabb561d6c295eb647123</anchor>
+      <anchor>ga15</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>g087136342c500c138d73dbe0e2aad11a</anchor>
+      <anchor>ga16</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>g5d675ab9877df60ec467a20a0d62fcbc</anchor>
+      <anchor>ga17</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>gd3fbd778898c2b0fba19d0937fb939f5</anchor>
+      <anchor>ga18</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>gaa76e04fcde3aa6c162fb9d2fcaca251</anchor>
+      <anchor>ga19</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>gcda38fc8e26a75c2b5d246b4341a8fd3</anchor>
+      <anchor>ga20</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>gdbdd8bad1742e87b5c5a299c2ebf7cf4</anchor>
+      <anchor>ga21</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>g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1</anchor>
+      <anchor>ga22</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>g68110f6d19b3987f6f66baee3926eb89</anchor>
+      <anchor>ga23</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>g7623276e130cb684670ecb153300ebaf</anchor>
+      <anchor>ga24</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>g751759cdeb8feb061c00f35d37fea45c</anchor>
+      <anchor>ga25</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>gea14f3cad139fc5b8d547a252deacff3</anchor>
+      <anchor>ga26</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>g775714bf75f1fdbdd895f59edc9eca55</anchor>
+      <anchor>ga27</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>g94d8cf912e3b036f67bc2d4c37d733ff</anchor>
+      <anchor>ga28</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>g30d5438686c8ead9a092f98bf3c3d8ca</anchor>
+      <anchor>ga29</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>g095834813ebbe8985d443e1fa78a0b98</anchor>
+      <anchor>ga30</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>ge89d8eb48e4a7a8107b87a44a4318064</anchor>
+      <anchor>ga31</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>g9fe5b4efdfaa3e79918dd5079e61e2c5</anchor>
+      <anchor>ga32</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>g8fef23ae01a368f4d16ad95813d97d6d</anchor>
+      <anchor>ga33</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>g54e35f94578f346c07718587f18b049c</anchor>
+      <anchor>ga34</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>g7a006418c4dbb265be71f7b5a202455d</anchor>
+      <anchor>ga35</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>ge66b9c64f5821ee6e95f4b9e18cadd4e</anchor>
+      <anchor>ga36</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>gc970fc314c6418d9193d93c787b908d9</anchor>
+      <anchor>ga37</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>g955b215a88b868cfc74d7a340de9b8f6</anchor>
+      <anchor>ga38</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>gf69f651a798e9f06c67baf06f0754228</anchor>
+      <anchor>ga39</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>g3dea1f995d40482b9f6470fedd994f95</anchor>
+      <anchor>ga40</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>g96fc73864dfc00ae418f14a81c72be26</anchor>
+      <anchor>ga41</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>gd0f6c2b153638f551d7709780eb7276a</anchor>
+      <anchor>ga42</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>g3c1ddd3c10c367c0912fdd841576278f</anchor>
+      <anchor>ga43</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_add_param</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga8dc4ff543dbc1882d673b25234088b6</anchor>
+      <anchor>ga44</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>g62c6225b0721d5c80d889edc307f0b6b</anchor>
+      <anchor>ga45</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>gf8aa1d7aba11de5fdee95b9cb339be61</anchor>
+      <anchor>ga46</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>ged453c314365a3948b195e3175455a12</anchor>
+      <anchor>ga47</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>gc5a3eb0348d31acf60772265c3896542</anchor>
+      <anchor>ga48</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>g711cf3e5e52fd3434ef7a9d16654aea8</anchor>
+      <anchor>ga49</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>g22338d64a871a8b279fdee6fd83fff7f</anchor>
+      <anchor>ga50</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>g5182246d4e0653f73dfaa40b62d4285f</anchor>
+      <anchor>ga51</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>g8134e4dc36b063a7d7dd229b9df32726</anchor>
+      <anchor>ga52</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>g6e6c5474c253a452073eba25251a1481</anchor>
+      <anchor>ga53</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>g82f7bbcf639c60678c1dc2aee24e8a24</anchor>
+      <anchor>ga54</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>g8c6cd5f3bb3ab59a4f06c020c062c13e</anchor>
+      <anchor>ga55</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>g778b0e43aad1e011012b8071b469c694</anchor>
+      <anchor>ga56</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>g8f67ed7dcee969e77374fb4daf468d58</anchor>
+      <anchor>ga57</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>g5f4adaadb80cd2d94569881d96cfa02e</anchor>
+      <anchor>ga58</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>g1f63514f8ffd8ea56f0beee69398ee01</anchor>
+      <anchor>ga59</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>gd40038a74fa7548da5fcaec6687c8787</anchor>
+      <anchor>ga60</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>gec605c647cab13d61ab5e2822d9f7ead</anchor>
+      <anchor>ga61</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>g71306c3e3118d9a4545b0a3cefb863ea</anchor>
+      <anchor>ga62</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>g65b18994af3384af04e2bf77e288f54f</anchor>
+      <anchor>ga63</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>gae28e4c640fba005a72e92af66327b50</anchor>
+      <anchor>ga64</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>gdeae102d1bd65147221f56e6095f35ef</anchor>
+      <anchor>ga65</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>g59b79c779211a72de534fb9e61548f97</anchor>
+      <anchor>ga66</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>gbf1d9c938d364598414e9f15c41c1f08</anchor>
+      <anchor>ga67</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>g18b8a4fb414245d2c30df9ee11057845</anchor>
+      <anchor>ga68</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>gd286782f691998858e30a202506bad74</anchor>
+      <anchor>ga69</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>gdd7769bfece8597cde869eced1239a1e</anchor>
+      <anchor>ga70</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>ga1620e4be3c7fb85262802338d3143f6</anchor>
+      <anchor>ga71</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>gf95184ecee86a92db2a7d3f050154a46</anchor>
+      <anchor>ga72</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>ga59b141facb320c409d9071f469fdbc5</anchor>
+      <anchor>ga73</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>g5efb45e6883a2522fd7e78c6eb761c79</anchor>
+      <anchor>ga74</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>g46195f69cc57bd18a4cde5756dd84601</anchor>
+      <anchor>ga75</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>g22bc2b8307fb6a95dac7fcf3d35bf6b9</anchor>
+      <anchor>ga76</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>gb4121cba599314c929d04cce0e850473</anchor>
+      <anchor>ga77</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>g4cc8b69619067f882035cca46e9ce0cd</anchor>
+      <anchor>ga78</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>g1a5a2746548465d681d00c6301a26100</anchor>
+      <anchor>ga79</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>gb918206f9b70fff5d58a16a762295981</anchor>
+      <anchor>ga80</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>g9f4db93fc31ad52018bc3ad14b58bfc2</anchor>
+      <anchor>ga81</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>gc7fe8cd335309d755fe5b54bf6b8e5a3</anchor>
+      <anchor>ga82</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>g7acde85eb361525f5cf481bafddbc1bd</anchor>
+      <anchor>ga83</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>g740a5cab681f30b8cc5e4ca18197e472</anchor>
+      <anchor>ga84</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>g4841e9250e4c7f38f2267355402ffcc1</anchor>
+      <anchor>ga85</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>g28203d9250f232f9af290802cf2db881</anchor>
+      <anchor>ga86</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>ge5b7e3356b3c1c893620fdeeea486e48</anchor>
+      <anchor>ga87</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>g9e992f880bd74cd4097527a39aea7125</anchor>
+      <anchor>ga88</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>gb9df68cbf9973203adfca5e1293b300a</anchor>
+      <anchor>ga89</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>ga79b051578077beca548be224062705c</anchor>
+      <anchor>ga90</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>g44793f2cf64b11917b8943d20ee43b9d</anchor>
+      <anchor>ga91</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>g8c04ab4487623a41e0b2600d466a88ad</anchor>
+      <anchor>ga92</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>g38a95079fd6f90a0c6a92c5ddeb104ca</anchor>
+      <anchor>ga93</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>g1c724bc85737bf8c698a08bc2d441b3e</anchor>
+      <anchor>ga94</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>g6fa1953ee96051566a261f3391da3857</anchor>
+      <anchor>ga95</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>ge12a7edf773cbe04fb98b171ba2c2fb9</anchor>
+      <anchor>ga96</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>g160150a3a39d66f5a807d1c750a57890</anchor>
+      <anchor>ga97</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>gf2aada3c00f9b00bc6a65014da87e250</anchor>
+      <anchor>ga98</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>g9fe388535a67f8360ab21f58233c0e17</anchor>
+      <anchor>ga99</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>gae6b21f76f675516e9189c47444e17cf</anchor>
+      <anchor>ga100</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>gb411dae8fb16ec9f289d4f2f1ecabcfc</anchor>
+      <anchor>ga101</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>g2deea3612965e28cd0d513c5850ca074</anchor>
+      <anchor>ga102</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>g056b021334fe812aa14bbbfd60aafba8</anchor>
+      <anchor>ga103</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>gcdfa2f747081721c03b10484a832a535</anchor>
+      <anchor>ga104</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>gadfd66825dd58fb8e0851d493445c4e4</anchor>
+      <anchor>ga105</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>geecfc1f1fdc97ea165ae35b64de95178</anchor>
+      <anchor>ga106</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>gdf6c305c48d012bc138db025c9bd63df</anchor>
+      <anchor>ga107</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>g5bd30b408d6ec16b3999dce5e540a5fa</anchor>
+      <anchor>ga108</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>gda8dd20ab17a9b403c68b4cd86fb529c</anchor>
+      <anchor>ga109</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>g0f09e85b570ffee4a4d94853bb22bcb3</anchor>
+      <anchor>ga110</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>g28d01beda4b54cec395654847dbbc301</anchor>
+      <anchor>ga111</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>gac76d8e06c3ce3fb0f27c0c80d6ad5fc</anchor>
+      <anchor>ga112</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>g8125d08f90002e654f2e45427e2f0251</anchor>
+      <anchor>ga113</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>g361d0ba27ad2ec9e99e5eec05f2e76a6</anchor>
+      <anchor>ga114</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>gb686075ecbdf349387c356826b432191</anchor>
+      <anchor>ga115</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>g64e5f74483ffb7bd4412f4eefeb22250</anchor>
+      <anchor>ga116</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>g57abcfb2fa58e743f9d30f579481845a</anchor>
+      <anchor>ga117</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>ge690d9171bcdb0fedf981804bb923fac</anchor>
+      <anchor>ga118</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>gebcb03afca6bb0d94e71bdf570d09af9</anchor>
+      <anchor>ga119</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>gf2c1a37f8d837fae61bb18de1cd7bdc3</anchor>
+      <anchor>ga120</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>g5735451225c2a355cb11c165e011637d</anchor>
+      <anchor>ga121</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>ge28b0d78641811b1625a52971a2d11fa</anchor>
+      <anchor>ga122</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>g9f897908b19f5f0cdaf75b483d46e041</anchor>
+      <anchor>ga123</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_allocate_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>geb61df54d59bfebdcb77b1e5e993ebaa</anchor>
+      <anchor>ga124</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>g089f9a34f26f700f43858ba3959d8f13</anchor>
+      <anchor>ga125</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>g8eea0724106ea7174b808026ae8d1a5c</anchor>
+      <anchor>ga126</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>gf64e586fca554f2dd65157a76eaad34a</anchor>
+      <anchor>ga127</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>ga1b826f02f84aa038c6862575770b629</anchor>
+      <anchor>ga128</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>g8a2924dd6393431e994d22c704ec25fc</anchor>
+      <anchor>ga129</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>gbd8b19b70d2f2fc7dcd7c896b3ed5d98</anchor>
+      <anchor>ga130</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>g6a08746f33133e8873236b35eb1e7a62</anchor>
+      <anchor>ga131</anchor>
       <arglist>(stp_parameter_t *desc, const stp_parameter_t *param)</arglist>
     </member>
   </compound>
   <compound kind="dir">
     <name>include/gutenprint/</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
-    <filename>dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html</filename>
+    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <filename>dir_000001.html</filename>
     <file>array.h</file>
     <file>bit-ops.h</file>
     <file>channel.h</file>
@@ -9003,8 +9003,8 @@
   </compound>
   <compound kind="dir">
     <name>include/</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/</path>
-    <filename>dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html</filename>
+    <path>/home/rlk/sandbox/print-4.3/include/</path>
+    <filename>dir_000000.html</filename>
     <dir>include/gutenprint/</dir>
   </compound>
 </tagfile>
diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html
index b7fcba2..0ea0f62 100644
--- a/doc/gutenprint/html/annotated.html
+++ b/doc/gutenprint/html/annotated.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <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>
@@ -55,8 +40,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html
index 39913b1..b571c08 100644
--- a/doc/gutenprint/html/array_8h.html
+++ b/doc/gutenprint/html/array_8h.html
@@ -2,74 +2,60 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#g69e0971771118ccea2a5dc72ba4fa73e">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#ga0">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#g69e0971771118ccea2a5dc72ba4fa73e"></a><br></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 colspan="2"><br><h2>Functions</h2></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="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="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">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">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">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">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 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 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">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">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">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">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">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">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">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">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">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">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">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">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 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 underlying stp_sequence_t.  <a href="group__array.html#g2051c3f4a1eaccb198744f8d7c76d649"></a><br></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>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Array functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html
index b4bf8b5..8d33a81 100644
--- a/doc/gutenprint/html/bit-ops_8h.html
+++ b/doc/gutenprint/html/bit-ops_8h.html
@@ -2,50 +2,36 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#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#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#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#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#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#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#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#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#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#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#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#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#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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Bit operations. 
 <p>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -88,7 +74,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -143,7 +129,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -210,7 +196,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -349,7 +335,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -404,7 +390,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -471,7 +457,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -562,8 +548,8 @@ Bit operations.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html
index a13da05..1816ca9 100644
--- a/doc/gutenprint/html/channel_8h.html
+++ b/doc/gutenprint/html/channel_8h.html
@@ -2,84 +2,70 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#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#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#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#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#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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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#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#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">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">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#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#9c4df56f4ad83b6232cf6ec17b6dc031">stp_channel_get_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">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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Channel functions. 
 <p>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -87,7 +73,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -128,7 +114,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -136,7 +122,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -165,7 +151,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="00bbe8c93cbe8da9f431824dbb1dadcd"></a><!-- doxytag: member="channel.h::stp_channel_get_black_channel" ref="00bbe8c93cbe8da9f431824dbb1dadcd" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="a11"></a><!-- doxytag: member="channel.h::stp_channel_get_black_channel" ref="a11" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -173,7 +159,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -193,15 +179,15 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="619228b113312c73cdce75b15bb88313"></a><!-- doxytag: member="channel.h::stp_channel_get_curve" ref="619228b113312c73cdce75b15bb88313" args="(stp_vars_t *v, int channel)" --><p>
+<a class="anchor" name="a17"></a><!-- doxytag: member="channel.h::stp_channel_get_curve" ref="a17" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_channel_get_curve           </td>
+          <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" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -230,7 +216,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -238,7 +224,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -273,7 +259,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -281,7 +267,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -316,15 +302,15 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="0f1e6073d53036f6771a0cc69cf9e261"></a><!-- doxytag: member="channel.h::stp_channel_get_gcr_curve" ref="0f1e6073d53036f6771a0cc69cf9e261" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="a19"></a><!-- doxytag: member="channel.h::stp_channel_get_gcr_curve" ref="a19" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_channel_get_gcr_curve           </td>
+          <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" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -344,7 +330,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a907ffda300039a00ae7ddb333038480"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_channel" ref="a907ffda300039a00ae7ddb333038480" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="a13"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_channel" ref="a13" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -352,7 +338,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -372,7 +358,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="e1702ed4a233cadce00e9bc87fd5ca45"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_limit" ref="e1702ed4a233cadce00e9bc87fd5ca45" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="a15"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_limit" ref="a15" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -380,7 +366,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -400,7 +386,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="f6423b74581fbf34918a9e45d22186b5"></a><!-- doxytag: member="channel.h::stp_channel_get_ink_limit" ref="f6423b74581fbf34918a9e45d22186b5" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="a7"></a><!-- doxytag: member="channel.h::stp_channel_get_ink_limit" ref="a7" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -408,7 +394,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -428,7 +414,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="f5ef85fbc689b2f94c0be23c0b8b3765"></a><!-- doxytag: member="channel.h::stp_channel_get_input" ref="f5ef85fbc689b2f94c0be23c0b8b3765" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="a22"></a><!-- doxytag: member="channel.h::stp_channel_get_input" ref="a22" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -436,7 +422,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -456,7 +442,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="9c4df56f4ad83b6232cf6ec17b6dc031"></a><!-- doxytag: member="channel.h::stp_channel_get_output" ref="9c4df56f4ad83b6232cf6ec17b6dc031" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="a23"></a><!-- doxytag: member="channel.h::stp_channel_get_output" ref="a23" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -464,7 +450,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -484,7 +470,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -492,7 +478,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -527,7 +513,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -535,7 +521,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -570,7 +556,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="dc5c0cc7cc331da0ab394b642a381363"></a><!-- doxytag: member="channel.h::stp_channel_reset" ref="dc5c0cc7cc331da0ab394b642a381363" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="channel.h::stp_channel_reset" ref="a0" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -578,7 +564,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -598,7 +584,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="6a88eb8e1f968370b63326e517a34ec2"></a><!-- doxytag: member="channel.h::stp_channel_reset_channel" ref="6a88eb8e1f968370b63326e517a34ec2" args="(stp_vars_t *v, int channel)" --><p>
+<a class="anchor" name="a1"></a><!-- doxytag: member="channel.h::stp_channel_reset_channel" ref="a1" args="(stp_vars_t *v, int channel)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -606,7 +592,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -635,7 +621,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -643,7 +629,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -672,7 +658,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -680,7 +666,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -692,7 +678,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em></td>
         </tr>
         <tr>
@@ -715,7 +701,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -723,7 +709,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -764,7 +750,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -772,7 +758,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -813,7 +799,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -821,13 +807,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em></td>
         </tr>
         <tr>
@@ -850,7 +836,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -858,7 +844,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -887,7 +873,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -895,7 +881,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -924,7 +910,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -932,7 +918,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -961,8 +947,8 @@ Channel functions.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html
index 7693064..1d86119 100644
--- a/doc/gutenprint/html/classes.html
+++ b/doc/gutenprint/html/classes.html
@@ -2,31 +2,16 @@
 <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.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>
+<!-- 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>
 <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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html
index 31f7f3b..9dd0774 100644
--- a/doc/gutenprint/html/color_8h.html
+++ b/doc/gutenprint/html/color_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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">
@@ -31,44 +17,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#gb711e2534c69bde47be7af3409c8ee2c">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#ga0">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#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#ga1">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#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">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga2">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"><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"><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#ga3">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">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">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga4">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">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#ga5">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#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#ga6">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#ga8b8b19da7bcc9bc814fe0f97f39b3ed">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#ga7">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#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 the number of available color modules.  <a href="group__color.html#ga7"></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#ga8">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#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 name.  <a href="group__color.html#ga8"></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#ga9">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#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="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="group__color.html#ga9"></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#ga10">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#g36d2d72d2cd967405a978b76a7a8c992">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#ga11">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#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 short (untranslated) name of a color module.  <a href="group__color.html#ga11"></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#ga12">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#ga0559d7812bdcbebe4edc14fc05274d9"></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#ga12"></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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html
index 398c681..7951a7f 100644
--- a/doc/gutenprint/html/curve-cache_8h.html
+++ b/doc/gutenprint/html/curve-cache_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -30,39 +16,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#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#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#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#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#b8c3f0a2734a4bdb08989cc62761e8e7">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#a2">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#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#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#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">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"><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"><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">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#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#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#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#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">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">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">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">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 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 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">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">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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Curve caching functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="b8c3f0a2734a4bdb08989cc62761e8e7"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_COUNT" ref="b8c3f0a2734a4bdb08989cc62761e8e7" args="(cache)" --><p>
+<a class="anchor" name="a2"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_COUNT" ref="a2" args="(cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -90,7 +76,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="b434b6a3a8ce63d95d11b2bce6360536"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_DOUBLE" ref="b434b6a3a8ce63d95d11b2bce6360536" args="(cache)" --><p>
+<a class="anchor" name="a1"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_DOUBLE" ref="a1" args="(cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -118,7 +104,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="c0763605d9b80d9889407dd340e357fd"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_USHORT" ref="c0763605d9b80d9889407dd340e357fd" args="(cache)" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_USHORT" ref="a0" args="(cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -147,7 +133,7 @@ Curve caching functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -184,7 +170,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -212,7 +198,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -240,7 +226,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -268,13 +254,13 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_cache_get_curve           </td>
+          <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" 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>
@@ -296,7 +282,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -324,7 +310,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -352,7 +338,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -366,7 +352,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em></td>
         </tr>
         <tr>
@@ -389,7 +375,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -403,7 +389,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em></td>
         </tr>
         <tr>
@@ -426,7 +412,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -454,8 +440,8 @@ Curve caching functions.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html
index fa3d9b5..76c8ff7 100644
--- a/doc/gutenprint/html/curve_8h.html
+++ b/doc/gutenprint/html/curve_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -33,175 +19,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#gd5ce135b7af2c6e79bae493c7055461d">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#ga0">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#gd5ce135b7af2c6e79bae493c7055461d"></a><br></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 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#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>
+<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>
  }</td></tr>
 
-<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>
+<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>
  }</td></tr>
 
-<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>
+<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>
  }</td></tr>
 
-<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>
+<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>
  }</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 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 colspan="2"><br><h2>Functions</h2></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="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="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">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">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 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 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">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">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">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">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">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">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 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 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">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">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="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="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="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="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">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">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">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">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">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">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#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#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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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="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="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="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="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.  <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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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 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 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">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">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#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#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 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 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">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">Compose two curves, creating a third curve.  <a href="group__curve.html#g657e0ad5b93f090220d35be615fec5e4"></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#ga46"></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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html
index 66b9d67..04fdb80 100644
--- a/doc/gutenprint/html/deprecated.html
+++ b/doc/gutenprint/html/deprecated.html
@@ -2,41 +2,20 @@
 <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.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>
+<!-- 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>
 <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#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>
+<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>
 </dl>
 <p>
 <a class="anchor" name="_deprecated000002"></a> <dl>
-<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>
+<dt>Global <a class="el" href="group__vars.html#ga37">stp_merge_printvars</a>  </dt>
+<dd>This is likely to go away.</dd>
 </dl>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<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_000000.html b/doc/gutenprint/html/dir_000000.html
new file mode 100644
index 0000000..be119bc
--- /dev/null
+++ b/doc/gutenprint/html/dir_000000.html
@@ -0,0 +1,20 @@
+<!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 Mon Jan 16 10:06:53 2006 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_2Fgutenprint_2F.html b/doc/gutenprint/html/dir_000001.html
index 94a415b..300dc2f 100644
--- a/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html
+++ b/doc/gutenprint/html/dir_000001.html
@@ -2,20 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -145,8 +136,8 @@
 
 <p>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<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
deleted file mode 100644
index 922c642..0000000
--- a/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html
+++ /dev/null
@@ -1,29 +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">
-<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/dirs.html b/doc/gutenprint/html/dirs.html
index f9a3cfd..74629ea 100644
--- a/doc/gutenprint/html/dirs.html
+++ b/doc/gutenprint/html/dirs.html
@@ -2,26 +2,17 @@
 <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.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>
+<!-- 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>
 <h1>libgutenprint API Reference Directories</h1>This directory hierarchy is sorted roughly, but not completely, alphabetically:<ul>
-<li><a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>
+<li><a class="el" href="dir_000000.html">include</a>
 <ul>
-<li><a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a>
+<li><a class="el" href="dir_000001.html">gutenprint</a>
 </ul>
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html
index 5c7dce3..626ae0f 100644
--- a/doc/gutenprint/html/dither_8h.html
+++ b/doc/gutenprint/html/dither_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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">
@@ -39,98 +25,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#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#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#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#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#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#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#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#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#3e02bef38f178e66a4439df6ec61c503">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#a4">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#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__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__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__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__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="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="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="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="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__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__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 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 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#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#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#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#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#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#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#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">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">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">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">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#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#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#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#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#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#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#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#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#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#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">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"><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__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__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"><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">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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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">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">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#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#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">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">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#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#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#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#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#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#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">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">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">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">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#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#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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Dither functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="575ca9b45d518b92177323e70295198a"></a><!-- doxytag: member="dither.h::STP_ECOLOR_C" ref="575ca9b45d518b92177323e70295198a" args="" --><p>
+<a class="anchor" name="a1"></a><!-- doxytag: member="dither.h::STP_ECOLOR_C" ref="a1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -153,7 +139,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="4faa7aec0dc7471ed5a7d1622991ac77"></a><!-- doxytag: member="dither.h::STP_ECOLOR_K" ref="4faa7aec0dc7471ed5a7d1622991ac77" args="" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="dither.h::STP_ECOLOR_K" ref="a0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -176,7 +162,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="c7f1f45ff56dfbaff0a36599c6bf822c"></a><!-- doxytag: member="dither.h::STP_ECOLOR_M" ref="c7f1f45ff56dfbaff0a36599c6bf822c" args="" --><p>
+<a class="anchor" name="a2"></a><!-- doxytag: member="dither.h::STP_ECOLOR_M" ref="a2" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -199,7 +185,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="e1492502d48a830e5dda11f1d7afb494"></a><!-- doxytag: member="dither.h::STP_ECOLOR_Y" ref="e1492502d48a830e5dda11f1d7afb494" args="" --><p>
+<a class="anchor" name="a3"></a><!-- doxytag: member="dither.h::STP_ECOLOR_Y" ref="a3" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -222,7 +208,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="3e02bef38f178e66a4439df6ec61c503"></a><!-- doxytag: member="dither.h::STP_NCOLORS" ref="3e02bef38f178e66a4439df6ec61c503" args="" --><p>
+<a class="anchor" name="a4"></a><!-- doxytag: member="dither.h::STP_NCOLORS" ref="a4" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -246,7 +232,7 @@ Dither functions.
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="c81f99c36dbc48c619831897bac28224"></a><!-- doxytag: member="dither.h::stp_dither_matrix_generic_t" ref="c81f99c36dbc48c619831897bac28224" args="" --><p>
+<a class="anchor" name="a7"></a><!-- doxytag: member="dither.h::stp_dither_matrix_generic_t" ref="a7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -269,7 +255,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="613c628e788dbef089fa32243500cd54"></a><!-- doxytag: member="dither.h::stp_dither_matrix_impl_t" ref="613c628e788dbef089fa32243500cd54" args="" --><p>
+<a class="anchor" name="a8"></a><!-- doxytag: member="dither.h::stp_dither_matrix_impl_t" ref="a8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -292,7 +278,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a7bbfbb8dd05a8c05a5c37143adc129a"></a><!-- doxytag: member="dither.h::stp_dither_matrix_normal_t" ref="a7bbfbb8dd05a8c05a5c37143adc129a" args="" --><p>
+<a class="anchor" name="a6"></a><!-- doxytag: member="dither.h::stp_dither_matrix_normal_t" ref="a6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -315,7 +301,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="373f2efaf250ca412b5447b8bd4e7f51"></a><!-- doxytag: member="dither.h::stp_dither_matrix_short_t" ref="373f2efaf250ca412b5447b8bd4e7f51" args="" --><p>
+<a class="anchor" name="a5"></a><!-- doxytag: member="dither.h::stp_dither_matrix_short_t" ref="a5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -338,7 +324,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="0a4617ed6063c68c6c8675fb9e8e9d01"></a><!-- doxytag: member="dither.h::stp_dotsize_t" ref="0a4617ed6063c68c6c8675fb9e8e9d01" args="" --><p>
+<a class="anchor" name="a9"></a><!-- doxytag: member="dither.h::stp_dotsize_t" ref="a9" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -361,7 +347,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="737b4edb8992127d0616e78f6c0a4c14"></a><!-- doxytag: member="dither.h::stp_shade_t" ref="737b4edb8992127d0616e78f6c0a4c14" args="" --><p>
+<a class="anchor" name="a10"></a><!-- doxytag: member="dither.h::stp_shade_t" ref="a10" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -385,7 +371,7 @@ Dither functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -393,7 +379,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -440,7 +426,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -448,7 +434,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -489,7 +475,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -497,7 +483,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -532,7 +518,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -540,7 +526,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -575,7 +561,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -583,7 +569,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -618,7 +604,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -626,7 +612,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -661,7 +647,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -669,7 +655,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -716,7 +702,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -724,7 +710,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -777,15 +763,15 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="9ad687cfc22956dd88495ae0a831c1b6"></a><!-- doxytag: member="dither.h::stp_dither_list_parameters" ref="9ad687cfc22956dd88495ae0a831c1b6" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="a23"></a><!-- doxytag: member="dither.h::stp_dither_list_parameters" ref="a23" 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> stp_dither_list_parameters           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">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>
@@ -805,7 +791,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -854,7 +840,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -891,7 +877,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="361cf36b4875e8ef2c8152f66d4a9284"></a><!-- doxytag: member="dither.h::stp_dither_matrix_destroy" ref="361cf36b4875e8ef2c8152f66d4a9284" args="(stp_dither_matrix_impl_t *mat)" --><p>
+<a class="anchor" name="a17"></a><!-- doxytag: member="dither.h::stp_dither_matrix_destroy" ref="a17" args="(stp_dither_matrix_impl_t *mat)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -919,7 +905,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -980,7 +966,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -994,7 +980,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -1023,7 +1009,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1084,7 +1070,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1133,7 +1119,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1170,7 +1156,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1207,7 +1193,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1250,7 +1236,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="05677f96e6de536ecf91a65ee0715998"></a><!-- doxytag: member="dither.h::stp_dither_matrix_validate_array" ref="05677f96e6de536ecf91a65ee0715998" args="(const stp_array_t *array)" --><p>
+<a class="anchor" name="a15"></a><!-- doxytag: member="dither.h::stp_dither_matrix_validate_array" ref="a15" args="(const stp_array_t *array)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1258,7 +1244,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&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="mdname1" valign="top" nowrap> <em>array</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1278,7 +1264,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1286,7 +1272,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1315,7 +1301,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1323,7 +1309,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1352,7 +1338,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1360,7 +1346,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1425,7 +1411,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1433,7 +1419,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1486,7 +1472,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1494,7 +1480,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1547,7 +1533,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1555,7 +1541,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1614,7 +1600,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1622,7 +1608,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1669,7 +1655,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1677,13 +1663,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -1712,7 +1698,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1720,7 +1706,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1755,7 +1741,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="d7cd0b4e7bf474516b14d0a186b23b96"></a><!-- doxytag: member="dither.h::stp_dither_set_transition" ref="d7cd0b4e7bf474516b14d0a186b23b96" args="(stp_vars_t *v, double)" --><p>
+<a class="anchor" name="a29"></a><!-- doxytag: member="dither.h::stp_dither_set_transition" ref="a29" args="(stp_vars_t *v, double)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1763,7 +1749,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1792,13 +1778,13 @@ Dither functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* stp_find_standard_dither_array           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">int&nbsp;</td>
           <td class="mdname" nowrap> <em>x_aspect</em>, </td>
@@ -1829,8 +1815,8 @@ Dither functions.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/doxygen.css b/doc/gutenprint/html/doxygen.css
index 05615b2..decae9e 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: #e8eef2;
-	border: 1px solid #84b0c7;
+	background-color: #eeeeff;
+	border: 1px solid #b0b0b0;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
@@ -26,16 +26,16 @@ DIV.qindex {
 }
 DIV.nav {
 	width: 100%;
-	background-color: #e8eef2;
-	border: 1px solid #84b0c7;
+	background-color: #eeeeff;
+	border: 1px solid #b0b0b0;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
 	line-height: 140%;
 }
 DIV.navtab {
-       background-color: #e8eef2;
-       border: 1px solid #84b0c7;
+       background-color: #eeeeff;
+       border: 1px solid #b0b0b0;
        text-align: center;
        margin: 2px;
        margin-right: 15px;
@@ -118,7 +118,7 @@ BODY {
 	margin-left: 20px;
 }
 TD.indexkey {
-	background-color: #e8eef2;
+	background-color: #eeeeff;
 	font-weight: bold;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -131,7 +131,7 @@ TD.indexkey {
 	border: 1px solid #CCCCCC;
 }
 TD.indexvalue {
-	background-color: #e8eef2;
+	background-color: #eeeeff;
 	font-style: italic;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -286,25 +286,24 @@ FORM.search {
 INPUT.search { font-size: 75%;
                color: #000080;
                font-weight: normal;
-               background-color: #e8eef2;
+               background-color: #eeeeff;
 }
 TD.tiny      { font-size: 75%;
 }
 a {
-	color: #1A41A8;
+	color: #252E78;
 }
 a:visited {
-	color: #2A3798;
+	color: #3D2185;
 }
 .dirtab { padding: 4px;
           border-collapse: collapse;
-          border: 1px solid #84b0c7;
+          border: 1px solid #b0b0b0;
 }
-TH.dirtab { background: #e8eef2;
+TH.dirtab { background: #eeeeff;
             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 fc0c57a..355f011 100644
--- a/doc/gutenprint/html/files.html
+++ b/doc/gutenprint/html/files.html
@@ -2,23 +2,9 @@
 <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.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>
+<!-- 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>
 <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>
@@ -46,8 +32,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html
index 8e045d2..6fd2d38 100644
--- a/doc/gutenprint/html/functions.html
+++ b/doc/gutenprint/html/functions.html
@@ -2,223 +2,176 @@
 <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.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>
+<!-- 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>
 
 <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#f1f713c9e000f5d3f280adbd124df4f5">stp_parameter_t</a><li>attrs
-: <a class="el" href="structstp__mxml__value__s.html#425ce871530e0633c917f98d8e9b1bc7">stp_mxml_value_s</a></ul>
+: <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>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>base
-: <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>
+: <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>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <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>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>
+: <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="structstp__color.html#o2">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="structstp__image.html#o6">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>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>d_cache
-: <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>
+: <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="structstp__colorfuncs__t.html#o3">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>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
-: <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>
+: <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>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
 <li>fast_mask
-: <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>
+: <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>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_appname
-: <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>
+: <a class="el" href="structstp__image.html#o5">stp_image</a><li>get_row
+: <a class="el" href="structstp__image.html#o4">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#o1">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#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>
+: <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="structstp__image.html#o3">stp_image</a><li>help
+: <a class="el" href="structstp__parameter__t.html#o3">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#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>
+: <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>
 <h3><a class="anchor" name="index_j">- j -</a></h3><ul>
 <li>jet
-: <a class="el" href="structstp__weave__t.html#564f60a2dd82ea24bfa3f2f615348f7c">stp_weave_t</a></ul>
+: <a class="el" href="structstp__weave__t.html#o2">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#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>
+: <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="structstp__colorfuncs__t.html#o2">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="structstp__color.html#o1">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>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>major
-: <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>
+: <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>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <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>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>
+: <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>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>opaque
-: <a class="el" href="unionstp__mxml__value__u.html#94619f8a70068b2591c2eed622525b0e">stp_mxml_value_u</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#o2">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#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>
+: <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>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>read_only
-: <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>
+: <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="structstp__image.html#o7">stp_image</a><li>reset
+: <a class="el" href="structstp__image.html#o1">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>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>s_cache
-: <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>
+: <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>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <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>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>
+: <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#0122b4c2c01ee1c698ecc309d2b8eb5a">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">stp_double_bound_t</a></ul>
+: <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>
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
-: <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>
+: <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>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
 <li>whitespace
-: <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>
+: <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="structstp__image.html#o2">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#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>
+: <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>
 <h3><a class="anchor" name="index_y">- y -</a></h3><ul>
 <li>y
-: <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 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 Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions_type.html b/doc/gutenprint/html/functions_type.html
deleted file mode 100644
index 0a2ebb1..0000000
--- a/doc/gutenprint/html/functions_type.html
+++ /dev/null
@@ -1,54 +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: 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 c1a81cb..1dd927f 100644
--- a/doc/gutenprint/html/functions_vars.html
+++ b/doc/gutenprint/html/functions_vars.html
@@ -2,208 +2,176 @@
 <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.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>
+<!-- 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>
 
 <p>
-&nbsp;
+
 <p>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>array
-: <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>
+: <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>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>base
-: <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>
+: <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>
 <h3><a class="anchor" name="index_c">- c -</a></h3><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>
+<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="structstp__color.html#o2">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="structstp__image.html#o6">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>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>d_cache
-: <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>
+: <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="structstp__colorfuncs__t.html#o3">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>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
-: <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>
+: <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>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
 <li>fast_mask
-: <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>
+: <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>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_appname
-: <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>
+: <a class="el" href="structstp__image.html#o5">stp_image</a><li>get_row
+: <a class="el" href="structstp__image.html#o4">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#o1">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#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>
+: <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="structstp__image.html#o3">stp_image</a><li>help
+: <a class="el" href="structstp__parameter__t.html#o3">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#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>
+: <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>
 <h3><a class="anchor" name="index_j">- j -</a></h3><ul>
 <li>jet
-: <a class="el" href="structstp__weave__t.html#564f60a2dd82ea24bfa3f2f615348f7c">stp_weave_t</a></ul>
+: <a class="el" href="structstp__weave__t.html#o2">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#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>
+: <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="structstp__colorfuncs__t.html#o2">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="structstp__color.html#o1">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>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>major
-: <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>
+: <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>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <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>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>
+: <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>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>opaque
-: <a class="el" href="unionstp__mxml__value__u.html#94619f8a70068b2591c2eed622525b0e">stp_mxml_value_u</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#o2">stp_mxml_value_u</a></ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><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>
+<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>
 <h3><a class="anchor" name="index_r">- r -</a></h3><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>
+<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="structstp__image.html#o7">stp_image</a><li>reset
+: <a class="el" href="structstp__image.html#o1">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>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>s_cache
-: <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>
+: <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>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <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>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>
+: <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>
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
-: <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>
+: <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>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
 <li>whitespace
-: <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>
+: <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="structstp__image.html#o2">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#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>
+: <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>
 <h3><a class="anchor" name="index_y">- y -</a></h3><ul>
 <li>y
-: <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 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 Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html
index 9e2911a..32d8b1b 100644
--- a/doc/gutenprint/html/globals.html
+++ b/doc/gutenprint/html/globals.html
@@ -2,56 +2,20 @@
 <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.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>
+<!-- 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>
 
 <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#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 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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html
index 2e4d7e4..0666089 100644
--- a/doc/gutenprint/html/globals_0x62.html
+++ b/doc/gutenprint/html/globals_0x62.html
@@ -2,56 +2,20 @@
 <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.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>
+<!-- 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>
 
 <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#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 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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html
index 8e2633f..44deb8e 100644
--- a/doc/gutenprint/html/globals_0x63.html
+++ b/doc/gutenprint/html/globals_0x63.html
@@ -2,59 +2,23 @@
 <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.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>
+<!-- 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>
 
 <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#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 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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html
index 5dfedeb..8af98da 100644
--- a/doc/gutenprint/html/globals_0x64.html
+++ b/doc/gutenprint/html/globals_0x64.html
@@ -2,57 +2,21 @@
 <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.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>
+<!-- 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>
 
 <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#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 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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html
index 2353e63..2f8dfbb 100644
--- a/doc/gutenprint/html/globals_0x67.html
+++ b/doc/gutenprint/html/globals_0x67.html
@@ -2,56 +2,20 @@
 <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.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>
+<!-- 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>
 
 <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#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 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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html
index 041adba..4495526 100644
--- a/doc/gutenprint/html/globals_0x6e.html
+++ b/doc/gutenprint/html/globals_0x6e.html
@@ -2,56 +2,20 @@
 <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.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>
+<!-- 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>
 
 <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#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 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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html
index 5e4d81b..80f4f6a 100644
--- a/doc/gutenprint/html/globals_0x70.html
+++ b/doc/gutenprint/html/globals_0x70.html
@@ -2,62 +2,26 @@
 <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.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>
+<!-- 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>
 
 <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#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 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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html
index 473ee69..b1d4327 100644
--- a/doc/gutenprint/html/globals_0x73.html
+++ b/doc/gutenprint/html/globals_0x73.html
@@ -2,681 +2,645 @@
 <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.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>
+<!-- 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>
 
 <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#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 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#ga8">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#ga7">color.h</a><li>stp_color_describe_parameter()
+: <a class="el" href="group__color.html#ga4">color.h</a><li>stp_color_get_long_name()
+: <a class="el" href="group__color.html#ga12">color.h</a><li>stp_color_get_name()
+: <a class="el" href="group__color.html#ga11">color.h</a><li>stp_color_get_row()
+: <a class="el" href="group__color.html#ga2">color.h</a><li>stp_color_init()
+: <a class="el" href="group__color.html#ga1">color.h</a><li>stp_color_list_parameters()
+: <a class="el" href="group__color.html#ga3">color.h</a><li>stp_color_register()
+: <a class="el" href="group__color.html#ga5">color.h</a><li>stp_color_t
+: <a class="el" href="group__color.html#ga0">color.h</a><li>stp_color_unregister()
+: <a class="el" href="group__color.html#ga6">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#ga10">color.h</a><li>stp_get_color_by_index()
+: <a class="el" href="group__color.html#ga9">color.h</a><li>stp_get_color_by_name()
+: <a class="el" href="group__color.html#ga8">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#ga7">image.h</a><li>stp_image_get_appname()
+: <a class="el" href="group__image.html#ga6">image.h</a><li>stp_image_get_row()
+: <a class="el" href="group__image.html#ga5">image.h</a><li>stp_image_height()
+: <a class="el" href="group__image.html#ga4">image.h</a><li>stp_image_init()
+: <a class="el" href="group__image.html#ga1">image.h</a><li>stp_image_reset()
+: <a class="el" href="group__image.html#ga2">image.h</a><li>STP_IMAGE_STATUS_ABORT
+: <a class="el" href="group__image.html#gga9a3">image.h</a><li>STP_IMAGE_STATUS_OK
+: <a class="el" href="group__image.html#gga9a2">image.h</a><li>stp_image_status_t
+: <a class="el" href="group__image.html#ga9">image.h</a><li>stp_image_t
+: <a class="el" href="group__image.html#ga0">image.h</a><li>stp_image_width()
+: <a class="el" href="group__image.html#ga3">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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html
index d53778f..0e627b4 100644
--- a/doc/gutenprint/html/globals_0x74.html
+++ b/doc/gutenprint/html/globals_0x74.html
@@ -2,56 +2,20 @@
 <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.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>
+<!-- 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>
 
 <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#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 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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html
index 9f018cb..e834c2a 100644
--- a/doc/gutenprint/html/globals_defs.html
+++ b/doc/gutenprint/html/globals_defs.html
@@ -2,129 +2,94 @@
 <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.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>
+<!-- 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>
 
 <p>
-&nbsp;
+
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_
-: <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>
+: <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>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>bindtextdomain
-: <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>
+: <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>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <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>
+: <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>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>dcgettext
-: <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>
+: <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>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gettext
-: <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>
+: <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>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>N_
-: <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>
+: <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>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>STP_BINARY_AGE
-: <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>
+: <a class="el" href="group__version.html#ga11">gutenprint-version.h</a><li>STP_CHANNEL_LIMIT
+: <a class="el" href="group__image.html#ga8">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>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>textdomain
-: <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 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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html
index c61d7cd..6540637 100644
--- a/doc/gutenprint/html/globals_enum.html
+++ b/doc/gutenprint/html/globals_enum.html
@@ -2,54 +2,30 @@
 <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.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;
+<!-- 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>
+
 <p>
 <ul>
 <li>stp_curve_bounds_t
-: <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 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#ga9">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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html
index 24b8a40..92ca001 100644
--- a/doc/gutenprint/html/globals_eval.html
+++ b/doc/gutenprint/html/globals_eval.html
@@ -2,111 +2,82 @@
 <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.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>
+<!-- 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>
 
 <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#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>
+: <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>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <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_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 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#gga9a3">image.h</a><li>STP_IMAGE_STATUS_OK
+: <a class="el" href="group__image.html#gga9a2">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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html
index 33a6aee..3a14614 100644
--- a/doc/gutenprint/html/globals_func.html
+++ b/doc/gutenprint/html/globals_func.html
@@ -2,503 +2,475 @@
 <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.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>
+<!-- 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>
 
 <p>
-&nbsp;
+
 <p>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stp_abort()
-: <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 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#ga7">color.h</a><li>stp_color_describe_parameter()
+: <a class="el" href="group__color.html#ga4">color.h</a><li>stp_color_get_long_name()
+: <a class="el" href="group__color.html#ga12">color.h</a><li>stp_color_get_name()
+: <a class="el" href="group__color.html#ga11">color.h</a><li>stp_color_get_row()
+: <a class="el" href="group__color.html#ga2">color.h</a><li>stp_color_init()
+: <a class="el" href="group__color.html#ga1">color.h</a><li>stp_color_list_parameters()
+: <a class="el" href="group__color.html#ga3">color.h</a><li>stp_color_register()
+: <a class="el" href="group__color.html#ga5">color.h</a><li>stp_color_unregister()
+: <a class="el" href="group__color.html#ga6">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#ga10">color.h</a><li>stp_get_color_by_index()
+: <a class="el" href="group__color.html#ga9">color.h</a><li>stp_get_color_by_name()
+: <a class="el" href="group__color.html#ga8">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#ga7">image.h</a><li>stp_image_get_appname()
+: <a class="el" href="group__image.html#ga6">image.h</a><li>stp_image_get_row()
+: <a class="el" href="group__image.html#ga5">image.h</a><li>stp_image_height()
+: <a class="el" href="group__image.html#ga4">image.h</a><li>stp_image_init()
+: <a class="el" href="group__image.html#ga1">image.h</a><li>stp_image_reset()
+: <a class="el" href="group__image.html#ga2">image.h</a><li>stp_image_width()
+: <a class="el" href="group__image.html#ga3">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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html
index eb9b536..3da366e 100644
--- a/doc/gutenprint/html/globals_type.html
+++ b/doc/gutenprint/html/globals_type.html
@@ -2,90 +2,61 @@
 <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.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>
+<!-- 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>
 
 <p>
-&nbsp;
+
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>compdata_t
-: <a class="el" href="group__vars.html#g9ee295029ad2d072b4099dc390359900">vars.h</a></ul>
+: <a class="el" href="group__vars.html#ga6">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#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 class="el" href="group__array.html#ga0">array.h</a><li>stp_color_t
+: <a class="el" href="group__color.html#ga0">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#ga0">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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html
index 1e673c7..68f42da 100644
--- a/doc/gutenprint/html/globals_vars.html
+++ b/doc/gutenprint/html/globals_vars.html
@@ -2,52 +2,28 @@
 <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.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;
+<!-- 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>
+
 <p>
 <ul>
 <li>stp_binary_age
-: <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 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 Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html
index 7bcf47f..9e5678b 100644
--- a/doc/gutenprint/html/group__array.html
+++ b/doc/gutenprint/html/group__array.html
@@ -2,71 +2,62 @@
 <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.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>
+<!-- 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>
 <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#g69e0971771118ccea2a5dc72ba4fa73e">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#ga0">stp_array_t</a></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 class="mdescLeft">&nbsp;</td><td class="mdescRight">The array opaque data type.  <a href="#ga0"></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#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="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="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">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">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">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">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 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 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">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">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">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">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">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">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">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">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">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">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">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">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 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 underlying stp_sequence_t.  <a href="#g2051c3f4a1eaccb198744f8d7c76d649"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="#ga11"></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="g69e0971771118ccea2a5dc72ba4fa73e"></a><!-- doxytag: member="array.h::stp_array_t" ref="g69e0971771118ccea2a5dc72ba4fa73e" args="" --><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>
 <table 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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_array <a class="el" href="group__array.html#ga0">stp_array_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -86,7 +77,7 @@ The array opaque data type.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -94,13 +85,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>source</em></td>
         </tr>
         <tr>
@@ -122,22 +113,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#gaf63aaff6ea861e16b3addc023ef2e66">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#ga1">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="gaf63aaff6ea861e16b3addc023ef2e66"></a><!-- doxytag: member="array.h::stp_array_create" ref="gaf63aaff6ea861e16b3addc023ef2e66" args="(int x_size, int y_size)" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="array.h::stp_array_create" ref="ga1" 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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* stp_array_create           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">int&nbsp;</td>
           <td class="mdname" nowrap> <em>x_size</em>, </td>
@@ -173,19 +164,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="g19370f7d4779013904be75bc3d97e024"></a><!-- doxytag: member="array.h::stp_array_create_copy" ref="g19370f7d4779013904be75bc3d97e024" args="(const stp_array_t *array)" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="array.h::stp_array_create_copy" ref="ga4" 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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* stp_array_create_copy           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">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>
@@ -204,16 +195,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#gaf63aaff6ea861e16b3addc023ef2e66">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#ga1">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="g562ad19d8ecc1e9bdd8c182b0a05ecec"></a><!-- doxytag: member="array.h::stp_array_destroy" ref="g562ad19d8ecc1e9bdd8c182b0a05ecec" args="(stp_array_t *array)" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="array.h::stp_array_destroy" ref="ga2" args="(stp_array_t *array)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -221,7 +212,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">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>
@@ -242,13 +233,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -256,7 +247,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&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="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -294,17 +285,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#g69e0971771118ccea2a5dc72ba4fa73e">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#ga0">stp_array_t</a> *array;
  size_t size;
  <span class="keywordtype">double</span> *data;
- <a class="code" href="group__array.html#g9e1c46379b5935ed3a939833bd9e68be">stp_array_get_data</a>(array, &amp;size, &amp;data);
-</pre></div> </td></tr>
+ <a class="code" href="group__array.html#ga8">stp_array_get_data</a>(array, &amp;size, &amp;data);
+</pre></div></td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -312,7 +303,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&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="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -360,19 +351,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="g2051c3f4a1eaccb198744f8d7c76d649"></a><!-- doxytag: member="array.h::stp_array_get_sequence" ref="g2051c3f4a1eaccb198744f8d7c76d649" args="(const stp_array_t *array)" --><p>
+<a class="anchor" name="ga11"></a><!-- doxytag: member="array.h::stp_array_get_sequence" ref="ga11" 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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>* stp_array_get_sequence           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">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>
@@ -396,11 +387,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -408,7 +399,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&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="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -446,13 +437,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="g0ca3891b4cde193cc65de63053e3f4fa"></a><!-- doxytag: member="array.h::stp_array_set_data" ref="g0ca3891b4cde193cc65de63053e3f4fa" args="(stp_array_t *array, const double *data)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -460,7 +451,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -491,13 +482,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="g4ab405205d678a3d9ae02a98103fbfea"></a><!-- doxytag: member="array.h::stp_array_set_point" ref="g4ab405205d678a3d9ae02a98103fbfea" args="(stp_array_t *array, int x, int y, double data)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -505,7 +496,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -553,11 +544,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="g698e51815f2ef3fd0709d6b32a2bb921"></a><!-- doxytag: member="array.h::stp_array_set_size" ref="g698e51815f2ef3fd0709d6b32a2bb921" args="(stp_array_t *array, int x_size, int y_size)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -565,7 +556,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -603,14 +594,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html
index 66aa11e..d4ed9ff 100644
--- a/doc/gutenprint/html/group__color.html
+++ b/doc/gutenprint/html/group__color.html
@@ -2,18 +2,9 @@
 <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.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>
+<!-- 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>
 <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>
@@ -23,44 +14,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#gb711e2534c69bde47be7af3409c8ee2c">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#ga0">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#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#ga1">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#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">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga2">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"><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"><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#ga3">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">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">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga4">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">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#ga5">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#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#ga6">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#ga8b8b19da7bcc9bc814fe0f97f39b3ed">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#ga7">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="#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 the number of available color modules.  <a href="#ga7"></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#ga8">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="#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 name.  <a href="#ga8"></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#ga9">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="#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="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="#ga9"></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#ga10">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#g36d2d72d2cd967405a978b76a7a8c992">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#ga11">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="#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 short (untranslated) name of a color module.  <a href="#ga11"></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#ga12">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>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="#ga12"></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="gb711e2534c69bde47be7af3409c8ee2c"></a><!-- doxytag: member="color.h::stp_color_t" ref="gb711e2534c69bde47be7af3409c8ee2c" 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="ga0"></a><!-- doxytag: member="color.h::stp_color_t" ref="ga0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -84,7 +75,7 @@ Color modules provide the actual functionality, so different colour management m
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga8b8b19da7bcc9bc814fe0f97f39b3ed"></a><!-- doxytag: member="color.h::stp_color_count" ref="ga8b8b19da7bcc9bc814fe0f97f39b3ed" args="(void)" --><p>
+<a class="anchor" name="ga7"></a><!-- doxytag: member="color.h::stp_color_count" ref="ga7" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -111,11 +102,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="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>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="color.h::stp_color_describe_parameter" ref="ga4" 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">
@@ -123,7 +114,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -158,7 +149,7 @@ Get the number of available color modules.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga0559d7812bdcbebe4edc14fc05274d9"></a><!-- doxytag: member="color.h::stp_color_get_long_name" ref="ga0559d7812bdcbebe4edc14fc05274d9" args="(const stp_color_t *c)" --><p>
+<a class="anchor" name="ga12"></a><!-- doxytag: member="color.h::stp_color_get_long_name" ref="ga12" args="(const stp_color_t *c)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -190,11 +181,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="g36d2d72d2cd967405a978b76a7a8c992"></a><!-- doxytag: member="color.h::stp_color_get_name" ref="g36d2d72d2cd967405a978b76a7a8c992" args="(const stp_color_t *c)" --><p>
+<a class="anchor" name="ga11"></a><!-- doxytag: member="color.h::stp_color_get_name" ref="ga11" args="(const stp_color_t *c)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -226,11 +217,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="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>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="color.h::stp_color_get_row" ref="ga2" 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">
@@ -238,7 +229,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -279,7 +270,7 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<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>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="color.h::stp_color_init" ref="ga1" args="(stp_vars_t *v, stp_image_t *image, size_t steps)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -287,7 +278,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -322,15 +313,15 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ge2e397268288111eaffd352cb0ff1b98"></a><!-- doxytag: member="color.h::stp_color_list_parameters" ref="ge2e397268288111eaffd352cb0ff1b98" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga3"></a><!-- doxytag: member="color.h::stp_color_list_parameters" ref="ga3" 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> stp_color_list_parameters           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">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>
@@ -350,7 +341,7 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ge3543409e331c5d1756c2c8fe927343b"></a><!-- doxytag: member="color.h::stp_color_register" ref="ge3543409e331c5d1756c2c8fe927343b" args="(const stp_color_t *color)" --><p>
+<a class="anchor" name="ga5"></a><!-- doxytag: member="color.h::stp_color_register" ref="ga5" args="(const stp_color_t *color)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -378,7 +369,7 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g3e0f2728d47e1701c00b06199bc5512d"></a><!-- doxytag: member="color.h::stp_color_unregister" ref="g3e0f2728d47e1701c00b06199bc5512d" args="(const stp_color_t *color)" --><p>
+<a class="anchor" name="ga6"></a><!-- doxytag: member="color.h::stp_color_unregister" ref="ga6" args="(const stp_color_t *color)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -406,7 +397,7 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga92373d7aa315ab6e32a1bb0ac944b79"></a><!-- doxytag: member="color.h::stp_get_color_by_colorfuncs" ref="ga92373d7aa315ab6e32a1bb0ac944b79" args="(stp_colorfuncs_t *colorfuncs)" --><p>
+<a class="anchor" name="ga10"></a><!-- doxytag: member="color.h::stp_get_color_by_colorfuncs" ref="ga10" args="(stp_colorfuncs_t *colorfuncs)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -434,7 +425,7 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga5ddc4c9d02576154d0b2c6c64a6a033"></a><!-- doxytag: member="color.h::stp_get_color_by_index" ref="ga5ddc4c9d02576154d0b2c6c64a6a033" args="(int idx)" --><p>
+<a class="anchor" name="ga9"></a><!-- doxytag: member="color.h::stp_get_color_by_index" ref="ga9" args="(int idx)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -466,11 +457,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="g25d9ee3ceee6d6e9964007ad12f9900b"></a><!-- doxytag: member="color.h::stp_get_color_by_name" ref="g25d9ee3ceee6d6e9964007ad12f9900b" args="(const char *name)" --><p>
+<a class="anchor" name="ga8"></a><!-- doxytag: member="color.h::stp_get_color_by_name" ref="ga8" args="(const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -502,12 +493,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>
+<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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html
index e9d3ecd..aab61b8 100644
--- a/doc/gutenprint/html/group__curve.html
+++ b/doc/gutenprint/html/group__curve.html
@@ -2,18 +2,9 @@
 <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.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>
+<!-- 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>
 <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>
@@ -22,182 +13,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#gd5ce135b7af2c6e79bae493c7055461d">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#ga0">stp_curve_t</a></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 class="mdescLeft">&nbsp;</td><td class="mdescRight">The curve opaque data type.  <a href="#ga0"></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#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>
+<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>
  }</td></tr>
 
-<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>
+<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>
  }</td></tr>
 
-<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>
+<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>
  }</td></tr>
 
-<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>
+<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>
  }</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 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 colspan="2"><br><h2>Functions</h2></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="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="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">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">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 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 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">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">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">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">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">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">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 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 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">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">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="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="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="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="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">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">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">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">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">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">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="#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="#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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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="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="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="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="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.  <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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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 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 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">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">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="#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="#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 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 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">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">Compose two curves, creating a third curve.  <a href="#g657e0ad5b93f090220d35be615fec5e4"></a><br></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>
 </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="gd5ce135b7af2c6e79bae493c7055461d"></a><!-- doxytag: member="curve.h::stp_curve_t" ref="gd5ce135b7af2c6e79bae493c7055461d" args="" --><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>
 <table 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_curve <a class="el" href="group__curve.html#ga0">stp_curve_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -217,13 +208,13 @@ The curve opaque data type.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="gd2b61113497bb142943d5131df3286ae"></a><!-- doxytag: member="curve.h::stp_curve_bounds_t" ref="gd2b61113497bb142943d5131df3286ae" args="" --><p>
+<a class="anchor" name="ga50"></a><!-- doxytag: member="curve.h::stp_curve_bounds_t" ref="ga50" 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#gd2b61113497bb142943d5131df3286ae">stp_curve_bounds_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -241,24 +232,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="ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09"></a><!-- doxytag: member="STP_CURVE_BOUNDS_RESCALE" ref="ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09" args="" -->STP_CURVE_BOUNDS_RESCALE</em>&nbsp;</td><td>
+<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>
 Rescale the bounds. </td></tr>
-<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>
+<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>
 Clip the curve to the existing bounds. </td></tr>
-<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>
+<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>
 Error if bounds are violated. </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="gb7d718baf4619b6be6c4aff8ce84aad9"></a><!-- doxytag: member="curve.h::stp_curve_compose_t" ref="gb7d718baf4619b6be6c4aff8ce84aad9" args="" --><p>
+<a class="anchor" name="ga49"></a><!-- doxytag: member="curve.h::stp_curve_compose_t" ref="ga49" 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#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -276,24 +267,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="ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d"></a><!-- doxytag: member="STP_CURVE_COMPOSE_ADD" ref="ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d" args="" -->STP_CURVE_COMPOSE_ADD</em>&nbsp;</td><td>
+<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>
 Add composition. </td></tr>
-<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>
+<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>
 Multiply composition. </td></tr>
-<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>
+<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>
 Exponentiate composition. </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="g7ced905b29f0d85de94258dceb01c3f4"></a><!-- doxytag: member="curve.h::stp_curve_type_t" ref="g7ced905b29f0d85de94258dceb01c3f4" args="" --><p>
+<a class="anchor" name="ga47"></a><!-- doxytag: member="curve.h::stp_curve_type_t" ref="ga47" 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#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga47">stp_curve_type_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -311,22 +302,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="gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff"></a><!-- doxytag: member="STP_CURVE_TYPE_LINEAR" ref="gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff" args="" -->STP_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
+<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>
 Linear interpolation. </td></tr>
-<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>
+<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>
 Spline interpolation. </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="g1880ff988f772337e8892e791951337b"></a><!-- doxytag: member="curve.h::stp_curve_wrap_mode_t" ref="g1880ff988f772337e8892e791951337b" args="" --><p>
+<a class="anchor" name="ga48"></a><!-- doxytag: member="curve.h::stp_curve_wrap_mode_t" ref="ga48" 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#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -344,9 +335,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="gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85"></a><!-- doxytag: member="STP_CURVE_WRAP_NONE" ref="gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85" args="" -->STP_CURVE_WRAP_NONE</em>&nbsp;</td><td>
+<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>
 The curve does not wrap. </td></tr>
-<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>
+<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>
 The curve wraps to its starting point. </td></tr>
 </table>
 </dl>
@@ -354,7 +345,7 @@ The curve wraps to its starting point. </td></tr>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -362,25 +353,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> **&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#ga0">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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#ga0">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#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>mode</em>, </td>
         </tr>
         <tr>
@@ -417,11 +408,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="gfdafb0a802f00063b00713dbd6d6bfc0"></a><!-- doxytag: member="curve.h::stp_curve_copy" ref="gfdafb0a802f00063b00713dbd6d6bfc0" args="(stp_curve_t *dest, const stp_curve_t *source)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -429,13 +420,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>source</em></td>
         </tr>
         <tr>
@@ -457,16 +448,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#gf6b71d25c497e99ab2c073108b080ab6">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#ga1">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="g48d9023f28ae2d15975002f7a9d7f94e"></a><!-- doxytag: member="curve.h::stp_curve_count_points" ref="g48d9023f28ae2d15975002f7a9d7f94e" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="ga10"></a><!-- doxytag: member="curve.h::stp_curve_count_points" ref="ga10" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -474,7 +465,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -498,19 +489,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="gf6b71d25c497e99ab2c073108b080ab6"></a><!-- doxytag: member="curve.h::stp_curve_create" ref="gf6b71d25c497e99ab2c073108b080ab6" args="(stp_curve_wrap_mode_t wrap)" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="curve.h::stp_curve_create" ref="ga1" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create           </td>
+          <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" valign="top">(&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="md" nowrap valign="top"><a class="el" href="group__curve.html#ga48">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>
@@ -535,19 +526,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="ge76787e84f2fc3ba299de94f4ecc6d82"></a><!-- doxytag: member="curve.h::stp_curve_create_copy" ref="ge76787e84f2fc3ba299de94f4ecc6d82" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="curve.h::stp_curve_create_copy" ref="ga2" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create_copy           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">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>
@@ -566,22 +557,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#gf6b71d25c497e99ab2c073108b080ab6">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#ga1">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="g6ff03fcc2a47f297c48b683884e81924"></a><!-- doxytag: member="curve.h::stp_curve_create_from_file" ref="g6ff03fcc2a47f297c48b683884e81924" args="(const char *file)" --><p>
+<a class="anchor" name="ga44"></a><!-- doxytag: member="curve.h::stp_curve_create_from_file" ref="ga44" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create_from_file           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const char *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>file</em>          </td>
@@ -608,17 +599,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="g650e49e1250dab5d9221ad747a627fc0"></a><!-- doxytag: member="curve.h::stp_curve_create_from_stream" ref="g650e49e1250dab5d9221ad747a627fc0" args="(FILE *fp)" --><p>
+<a class="anchor" name="ga43"></a><!-- doxytag: member="curve.h::stp_curve_create_from_stream" ref="ga43" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create_from_stream           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">FILE *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>fp</em>          </td>
@@ -645,17 +636,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="g60dce8c741a9b6fde73ced2134305298"></a><!-- doxytag: member="curve.h::stp_curve_create_from_string" ref="g60dce8c741a9b6fde73ced2134305298" args="(const char *string)" --><p>
+<a class="anchor" name="ga45"></a><!-- doxytag: member="curve.h::stp_curve_create_from_string" ref="ga45" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create_from_string           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const char *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>string</em>          </td>
@@ -682,11 +673,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="g01bf94ed6a523f28dd909be054a69790"></a><!-- doxytag: member="curve.h::stp_curve_destroy" ref="g01bf94ed6a523f28dd909be054a69790" args="(stp_curve_t *curve)" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="curve.h::stp_curve_destroy" ref="ga4" args="(stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -694,7 +685,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">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>
@@ -715,13 +706,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="g4d32e3000dd3a8f258b2eab94797731b"></a><!-- doxytag: member="curve.h::stp_curve_get_bounds" ref="g4d32e3000dd3a8f258b2eab94797731b" args="(const stp_curve_t *curve, double *low, double *high)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -729,7 +720,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -767,13 +758,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="g24b9486c45d68983e94dcc0fb19edacd"></a><!-- doxytag: member="curve.h::stp_curve_get_data" ref="g24b9486c45d68983e94dcc0fb19edacd" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -781,7 +772,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -815,11 +806,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="gd30e41654f1e0217aae3389b30cdffba"></a><!-- doxytag: member="curve.h::stp_curve_get_data_points" ref="gd30e41654f1e0217aae3389b30cdffba" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -827,7 +818,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -861,11 +852,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="gf363a0f9686bcd6521671d531bc522d5"></a><!-- doxytag: member="curve.h::stp_curve_get_float_data" ref="gf363a0f9686bcd6521671d531bc522d5" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -873,7 +864,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -907,11 +898,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="gc9786b35c2b1a55d54b62bcc57481c82"></a><!-- doxytag: member="curve.h::stp_curve_get_gamma" ref="gc9786b35c2b1a55d54b62bcc57481c82" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="ga35"></a><!-- doxytag: member="curve.h::stp_curve_get_gamma" ref="ga35" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -919,7 +910,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -938,11 +929,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="g01bda0b947a6075d4a1ed373865744e6"></a><!-- doxytag: member="curve.h::stp_curve_get_int_data" ref="g01bda0b947a6075d4a1ed373865744e6" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -950,7 +941,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -984,19 +975,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="gca245aa6907c2fb95e150ce9a86ddb1a"></a><!-- doxytag: member="curve.h::stp_curve_get_interpolation_type" ref="gca245aa6907c2fb95e150ce9a86ddb1a" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="ga12"></a><!-- doxytag: member="curve.h::stp_curve_get_interpolation_type" ref="ga12" 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#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a> stp_curve_get_interpolation_type           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">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>
@@ -1020,11 +1011,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="g187af251d5a89853545c8be898a00cc1"></a><!-- doxytag: member="curve.h::stp_curve_get_long_data" ref="g187af251d5a89853545c8be898a00cc1" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1032,7 +1023,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1066,11 +1057,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="gf9ff6f55ec0a0615608dc1baec6aff00"></a><!-- doxytag: member="curve.h::stp_curve_get_point" ref="gf9ff6f55ec0a0615608dc1baec6aff00" args="(const stp_curve_t *curve, size_t where, double *data)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1078,7 +1069,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1119,11 +1110,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="gaf8bad025ea7463067c9d7ab205af062"></a><!-- doxytag: member="curve.h::stp_curve_get_range" ref="gaf8bad025ea7463067c9d7ab205af062" args="(const stp_curve_t *curve, double *low, double *high)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1131,7 +1122,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1166,15 +1157,15 @@ Get a point along the curve.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gee3cc69ab758b400838014df4742c28e"></a><!-- doxytag: member="curve.h::stp_curve_get_sequence" ref="gee3cc69ab758b400838014df4742c28e" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="ga33"></a><!-- doxytag: member="curve.h::stp_curve_get_sequence" ref="ga33" 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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>* stp_curve_get_sequence           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">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>
@@ -1198,11 +1189,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="g60767bb2143fe4d491d351a4c0abc3b1"></a><!-- doxytag: member="curve.h::stp_curve_get_short_data" ref="g60767bb2143fe4d491d351a4c0abc3b1" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1210,7 +1201,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1244,19 +1235,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="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>
+<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>
 <table 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_get_subrange           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1297,11 +1288,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="gb874365285383f3eb35c1a32496a69b4"></a><!-- doxytag: member="curve.h::stp_curve_get_uint_data" ref="gb874365285383f3eb35c1a32496a69b4" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1309,7 +1300,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1343,11 +1334,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="g3ecbc0ce98e7bd7695002306f5a2ba1b"></a><!-- doxytag: member="curve.h::stp_curve_get_ulong_data" ref="g3ecbc0ce98e7bd7695002306f5a2ba1b" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1355,7 +1346,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1389,11 +1380,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="gb2312169172ec9789af9fd38279b3273"></a><!-- doxytag: member="curve.h::stp_curve_get_ushort_data" ref="gb2312169172ec9789af9fd38279b3273" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1401,7 +1392,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1435,19 +1426,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="gd2aade6a22b516006ce0f897c5027f35"></a><!-- doxytag: member="curve.h::stp_curve_get_wrap" ref="gd2aade6a22b516006ce0f897c5027f35" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="ga7"></a><!-- doxytag: member="curve.h::stp_curve_get_wrap" ref="ga7" 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#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a> stp_curve_get_wrap           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">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>
@@ -1471,11 +1462,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="g0fdfc2b27a8a464584589ef38a8e05c4"></a><!-- doxytag: member="curve.h::stp_curve_interpolate_value" ref="g0fdfc2b27a8a464584589ef38a8e05c4" args="(const stp_curve_t *curve, double where, double *result)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1483,7 +1474,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1524,11 +1515,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="gdda4313c874170e0086d2000ed04c02f"></a><!-- doxytag: member="curve.h::stp_curve_is_piecewise" ref="gdda4313c874170e0086d2000ed04c02f" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="ga8"></a><!-- doxytag: member="curve.h::stp_curve_is_piecewise" ref="ga8" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1536,7 +1527,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1560,11 +1551,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="gf68cf2508ff4a14a0dbee6fc0001667e"></a><!-- doxytag: member="curve.h::stp_curve_resample" ref="gf68cf2508ff4a14a0dbee6fc0001667e" args="(stp_curve_t *curve, size_t points)" --><p>
+<a class="anchor" name="ga39"></a><!-- doxytag: member="curve.h::stp_curve_resample" ref="ga39" args="(stp_curve_t *curve, size_t points)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1572,7 +1563,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1606,11 +1597,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1618,7 +1609,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1630,13 +1621,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#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#ga49">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#gd2b61113497bb142943d5131df3286ae">stp_curve_bounds_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>bounds_mode</em></td>
         </tr>
         <tr>
@@ -1666,11 +1657,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="g5283a18fcc5db8e9f9384d54de50ba83"></a><!-- doxytag: member="curve.h::stp_curve_set_bounds" ref="g5283a18fcc5db8e9f9384d54de50ba83" args="(stp_curve_t *curve, double low, double high)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1678,7 +1669,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1719,11 +1710,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="gba540befdbd82e705358b2175d5b92e8"></a><!-- doxytag: member="curve.h::stp_curve_set_data" ref="gba540befdbd82e705358b2175d5b92e8" args="(stp_curve_t *curve, size_t count, const double *data)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1731,7 +1722,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1772,11 +1763,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1784,7 +1775,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1825,11 +1816,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1837,7 +1828,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1878,11 +1869,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="g6548b7ca6ef6ab94fe1d927c246e7baf"></a><!-- doxytag: member="curve.h::stp_curve_set_gamma" ref="g6548b7ca6ef6ab94fe1d927c246e7baf" args="(stp_curve_t *curve, double f_gamma)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1890,7 +1881,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1924,11 +1915,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1936,7 +1927,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1977,11 +1968,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="g3175711d943e95fdf363d5124237a56e"></a><!-- doxytag: member="curve.h::stp_curve_set_interpolation_type" ref="g3175711d943e95fdf363d5124237a56e" args="(stp_curve_t *curve, stp_curve_type_t itype)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1989,13 +1980,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">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#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>itype</em></td>
         </tr>
         <tr>
@@ -2023,11 +2014,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2035,7 +2026,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2076,11 +2067,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="g9a05eae4f274f420418539cceb627556"></a><!-- doxytag: member="curve.h::stp_curve_set_point" ref="g9a05eae4f274f420418539cceb627556" args="(stp_curve_t *curve, size_t where, double data)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2088,7 +2079,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2129,11 +2120,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2141,7 +2132,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2182,11 +2173,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2194,13 +2185,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>range</em>, </td>
         </tr>
         <tr>
@@ -2229,7 +2220,7 @@ If any of the data points fall outside the bounds, the operation is not performe
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2237,7 +2228,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2278,11 +2269,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2290,7 +2281,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2331,11 +2322,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2343,7 +2334,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2384,11 +2375,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="g6ef71ce7d92e659b1c902df29b1dcbc7"></a><!-- doxytag: member="curve.h::stp_curve_write" ref="g6ef71ce7d92e659b1c902df29b1dcbc7" args="(FILE *file, const stp_curve_t *curve)" --><p>
+<a class="anchor" name="ga41"></a><!-- doxytag: member="curve.h::stp_curve_write" ref="ga41" args="(FILE *file, const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2402,7 +2393,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em></td>
         </tr>
         <tr>
@@ -2431,11 +2422,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="g21aa4497c58ebbb703dc3549560f084d"></a><!-- doxytag: member="curve.h::stp_curve_write_string" ref="g21aa4497c58ebbb703dc3549560f084d" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="ga42"></a><!-- doxytag: member="curve.h::stp_curve_write_string" ref="ga42" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2443,7 +2434,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2468,12 +2459,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html
index 718042c..8a70c36 100644
--- a/doc/gutenprint/html/group__image.html
+++ b/doc/gutenprint/html/group__image.html
@@ -2,18 +2,9 @@
 <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.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>
+<!-- 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>
 <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>
@@ -22,39 +13,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#gf71d7111a7215d4c1f1ef1317f9d6cfc">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#ga8">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#gc5b6b70cd39959ffd06deab3724d87e9">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#ga0">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="#gc5b6b70cd39959ffd06deab3724d87e9"></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="#ga0"></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#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>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga9">stp_image_status_t</a> { <a class="el" href="group__image.html#gga9a2">STP_IMAGE_STATUS_OK</a>, 
+<a class="el" href="group__image.html#gga9a3">STP_IMAGE_STATUS_ABORT</a>
  }</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 class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#ga9">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#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#ga1">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#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">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga2">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#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#ga3">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#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">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga4">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#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"><a class="el" href="group__image.html#ga9">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga5">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#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">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga6">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#gd1017f2f9b91d7add73c2393d96f700a">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#ga7">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>
 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="gf71d7111a7215d4c1f1ef1317f9d6cfc"></a><!-- doxytag: member="image.h::STP_CHANNEL_LIMIT" ref="gf71d7111a7215d4c1f1ef1317f9d6cfc" args="" --><p>
+<a class="anchor" name="ga8"></a><!-- doxytag: member="image.h::STP_CHANNEL_LIMIT" ref="ga8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -78,7 +69,7 @@ The maximum number of channels.     </td>
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="gc5b6b70cd39959ffd06deab3724d87e9"></a><!-- doxytag: member="image.h::stp_image_t" ref="gc5b6b70cd39959ffd06deab3724d87e9" args="" --><p>
+<a class="anchor" name="ga0"></a><!-- doxytag: member="image.h::stp_image_t" ref="ga0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -100,17 +91,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="g3378dd231cc63da06de0bb41f1cde78f"></a><!-- doxytag: member="image.h::stp_image_status_t" ref="g3378dd231cc63da06de0bb41f1cde78f" args="" --><p>
+<a class="anchor" name="ga9"></a><!-- doxytag: member="image.h::stp_image_status_t" ref="ga9" 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#g3378dd231cc63da06de0bb41f1cde78f">stp_image_status_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__image.html#ga9">stp_image_status_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -128,9 +119,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="gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5"></a><!-- doxytag: member="STP_IMAGE_STATUS_OK" ref="gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5" args="" -->STP_IMAGE_STATUS_OK</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga9a2"></a><!-- doxytag: member="STP_IMAGE_STATUS_OK" ref="gga9a2" args="" -->STP_IMAGE_STATUS_OK</em>&nbsp;</td><td>
 Everything is OK. </td></tr>
-<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>
+<tr><td valign="top"><em><a class="anchor" name="gga9a3"></a><!-- doxytag: member="STP_IMAGE_STATUS_ABORT" ref="gga9a3" args="" -->STP_IMAGE_STATUS_ABORT</em>&nbsp;</td><td>
 An error occured, or the job was aborted. </td></tr>
 </table>
 </dl>
@@ -138,7 +129,7 @@ An error occured, or the job was aborted. </td></tr>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="gd1017f2f9b91d7add73c2393d96f700a"></a><!-- doxytag: member="image.h::stp_image_conclude" ref="gd1017f2f9b91d7add73c2393d96f700a" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="ga7"></a><!-- doxytag: member="image.h::stp_image_conclude" ref="ga7" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -166,7 +157,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="gd36123431e93e049d813894aa039c25c"></a><!-- doxytag: member="image.h::stp_image_get_appname" ref="gd36123431e93e049d813894aa039c25c" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="ga6"></a><!-- doxytag: member="image.h::stp_image_get_appname" ref="ga6" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -194,13 +185,13 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<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>
+<a class="anchor" name="ga5"></a><!-- doxytag: member="image.h::stp_image_get_row" ref="ga5" 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#g3378dd231cc63da06de0bb41f1cde78f">stp_image_status_t</a> stp_image_get_row           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__image.html#ga9">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>
@@ -243,7 +234,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="g48a99a9a8493b75687ad0900664ca4cb"></a><!-- doxytag: member="image.h::stp_image_height" ref="g48a99a9a8493b75687ad0900664ca4cb" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="image.h::stp_image_height" ref="ga4" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -271,7 +262,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="g74c2417d571861506be7209421a3b418"></a><!-- doxytag: member="image.h::stp_image_init" ref="g74c2417d571861506be7209421a3b418" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="image.h::stp_image_init" ref="ga1" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -299,7 +290,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="g69cd20ccb54500d0ee8cf38969db69a6"></a><!-- doxytag: member="image.h::stp_image_reset" ref="g69cd20ccb54500d0ee8cf38969db69a6" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="image.h::stp_image_reset" ref="ga2" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -327,7 +318,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="g9ee4915d4a1007f2d9c730ddc96d931b"></a><!-- doxytag: member="image.h::stp_image_width" ref="g9ee4915d4a1007f2d9c730ddc96d931b" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="ga3"></a><!-- doxytag: member="image.h::stp_image_width" ref="ga3" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -355,8 +346,8 @@ An error occured, or the job was aborted. </td></tr>
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html
index 917cb88..036e11e 100644
--- a/doc/gutenprint/html/group__intl.html
+++ b/doc/gutenprint/html/group__intl.html
@@ -2,42 +2,33 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#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#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#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#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#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#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#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#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#g9de9caf5267f08d8164404a1f68b66f5">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#ga6">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="gd41443e9a10bd2ffa9508bb74c41c2d1"></a><!-- doxytag: member="gutenprint-intl.h::_" ref="gd41443e9a10bd2ffa9508bb74c41c2d1" 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="ga5"></a><!-- doxytag: member="gutenprint-intl.h::_" ref="ga5" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -65,7 +56,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="gcf29daa2fef5f417c57be476054c695b"></a><!-- doxytag: member="gutenprint-intl.h::bindtextdomain" ref="gcf29daa2fef5f417c57be476054c695b" args="(Domain, Directory)" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="gutenprint-intl.h::bindtextdomain" ref="ga4" args="(Domain, Directory)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -96,7 +87,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="g52d955a76a73f0e86dddd07dda5cd490"></a><!-- doxytag: member="gutenprint-intl.h::dcgettext" ref="g52d955a76a73f0e86dddd07dda5cd490" args="(Domain, Message, Type)" --><p>
+<a class="anchor" name="ga3"></a><!-- doxytag: member="gutenprint-intl.h::dcgettext" ref="ga3" args="(Domain, Message, Type)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -130,7 +121,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="g7fd6ec2ffaa95339754232b69eaac521"></a><!-- doxytag: member="gutenprint-intl.h::dgettext" ref="g7fd6ec2ffaa95339754232b69eaac521" args="(Domain, Message)" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="gutenprint-intl.h::dgettext" ref="ga2" args="(Domain, Message)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -161,7 +152,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="geb8333d9b46653f2047c603034d26730"></a><!-- doxytag: member="gutenprint-intl.h::gettext" ref="geb8333d9b46653f2047c603034d26730" args="(String)" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="gutenprint-intl.h::gettext" ref="ga1" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -189,7 +180,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="g9de9caf5267f08d8164404a1f68b66f5"></a><!-- doxytag: member="gutenprint-intl.h::N_" ref="g9de9caf5267f08d8164404a1f68b66f5" args="(String)" --><p>
+<a class="anchor" name="ga6"></a><!-- doxytag: member="gutenprint-intl.h::N_" ref="ga6" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -217,7 +208,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="gac0316f33cabc5a70d974c5aba43063b"></a><!-- doxytag: member="gutenprint-intl.h::textdomain" ref="gac0316f33cabc5a70d974c5aba43063b" args="(String)" --><p>
+<a class="anchor" name="ga0"></a><!-- doxytag: member="gutenprint-intl.h::textdomain" ref="ga0" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -245,8 +236,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html
index 41f1bd7..f9f8009 100644
--- a/doc/gutenprint/html/group__intl__internal.html
+++ b/doc/gutenprint/html/group__intl__internal.html
@@ -2,42 +2,33 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#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#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#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#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#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#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#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#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#g9de9caf5267f08d8164404a1f68b66f5">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#ga6">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="gd41443e9a10bd2ffa9508bb74c41c2d1"></a><!-- doxytag: member="gutenprint-intl-internal.h::_" ref="gd41443e9a10bd2ffa9508bb74c41c2d1" 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="ga5"></a><!-- doxytag: member="gutenprint-intl-internal.h::_" ref="ga5" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -65,7 +56,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="gcf29daa2fef5f417c57be476054c695b"></a><!-- doxytag: member="gutenprint-intl-internal.h::bindtextdomain" ref="gcf29daa2fef5f417c57be476054c695b" args="(Domain, Directory)" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="gutenprint-intl-internal.h::bindtextdomain" ref="ga4" args="(Domain, Directory)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -96,7 +87,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="g52d955a76a73f0e86dddd07dda5cd490"></a><!-- doxytag: member="gutenprint-intl-internal.h::dcgettext" ref="g52d955a76a73f0e86dddd07dda5cd490" args="(Domain, Message, Type)" --><p>
+<a class="anchor" name="ga3"></a><!-- doxytag: member="gutenprint-intl-internal.h::dcgettext" ref="ga3" args="(Domain, Message, Type)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -130,7 +121,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="g7fd6ec2ffaa95339754232b69eaac521"></a><!-- doxytag: member="gutenprint-intl-internal.h::dgettext" ref="g7fd6ec2ffaa95339754232b69eaac521" args="(Domain, Message)" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="gutenprint-intl-internal.h::dgettext" ref="ga2" args="(Domain, Message)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -161,7 +152,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="geb8333d9b46653f2047c603034d26730"></a><!-- doxytag: member="gutenprint-intl-internal.h::gettext" ref="geb8333d9b46653f2047c603034d26730" args="(String)" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="gutenprint-intl-internal.h::gettext" ref="ga1" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -189,7 +180,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="g9de9caf5267f08d8164404a1f68b66f5"></a><!-- doxytag: member="gutenprint-intl-internal.h::N_" ref="g9de9caf5267f08d8164404a1f68b66f5" args="(String)" --><p>
+<a class="anchor" name="ga6"></a><!-- doxytag: member="gutenprint-intl-internal.h::N_" ref="ga6" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -217,7 +208,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="gac0316f33cabc5a70d974c5aba43063b"></a><!-- doxytag: member="gutenprint-intl-internal.h::textdomain" ref="gac0316f33cabc5a70d974c5aba43063b" args="(String)" --><p>
+<a class="anchor" name="ga0"></a><!-- doxytag: member="gutenprint-intl-internal.h::textdomain" ref="ga0" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -245,8 +236,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html
index f550381..6f5653e 100644
--- a/doc/gutenprint/html/group__list.html
+++ b/doc/gutenprint/html/group__list.html
@@ -2,131 +2,122 @@
 <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.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>
+<!-- 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>
 <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#g71c64aeca8ca0613215306f088b6a963">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#ga0">stp_list_item_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 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 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">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">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 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 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 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 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 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 compare two nodes.  <a href="#gd7ac92a42bf2184103e0a83147d1835f"></a><br></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 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#gb357e17f729e41b4f96d6aada1be26b9">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#ga6">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="#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">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">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">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">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">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">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">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">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 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 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 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 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 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 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 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 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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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 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 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 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 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">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">Set the data associated with a list item.  <a href="#g1b5d2889a81d712c3ba024e53bfd0f38"></a><br></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>
 </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="g71c64aeca8ca0613215306f088b6a963"></a><!-- doxytag: member="list.h::stp_list_item_t" ref="g71c64aeca8ca0613215306f088b6a963" 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="ga0"></a><!-- doxytag: member="list.h::stp_list_item_t" ref="ga0" 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#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -142,16 +133,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="g01be7c3ea8c46226978010d453016f22"></a><!-- doxytag: member="list.h::stp_list_t" ref="g01be7c3ea8c46226978010d453016f22" args="" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="list.h::stp_list_t" ref="ga1" 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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_list <a class="el" href="group__list.html#ga1">stp_list_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -167,16 +158,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="g589c7c30b003d694b844834a41a6b1fa"></a><!-- doxytag: member="list.h::stp_node_copyfunc" ref="g589c7c30b003d694b844834a41a6b1fa" args=")(const void *)" --><p>
+<a class="anchor" name="ga3"></a><!-- doxytag: member="list.h::stp_node_copyfunc" ref="ga3" 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#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a>)(const void *)          </td>
+          <td class="md" nowrap valign="top">typedef void*(* <a class="el" href="group__list.html#ga3">stp_node_copyfunc</a>)(const void *)          </td>
         </tr>
       </table>
     </td>
@@ -192,16 +183,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="g3744d9043311d0bcbb21f80e79b9afba"></a><!-- doxytag: member="list.h::stp_node_freefunc" ref="g3744d9043311d0bcbb21f80e79b9afba" args=")(void *)" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="list.h::stp_node_freefunc" ref="ga2" 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#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a>)(void *)          </td>
+          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__list.html#ga2">stp_node_freefunc</a>)(void *)          </td>
         </tr>
       </table>
     </td>
@@ -217,16 +208,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="g1c6584d7cf0cda45dce5d95249af6470"></a><!-- doxytag: member="list.h::stp_node_namefunc" ref="g1c6584d7cf0cda45dce5d95249af6470" args=")(const void *)" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="list.h::stp_node_namefunc" ref="ga4" 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#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a>)(const void *)          </td>
+          <td class="md" nowrap valign="top">typedef const char*(* <a class="el" href="group__list.html#ga4">stp_node_namefunc</a>)(const void *)          </td>
         </tr>
       </table>
     </td>
@@ -242,16 +233,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="gd7ac92a42bf2184103e0a83147d1835f"></a><!-- doxytag: member="list.h::stp_node_sortfunc" ref="gd7ac92a42bf2184103e0a83147d1835f" args=")(const void *, const void *)" --><p>
+<a class="anchor" name="ga5"></a><!-- doxytag: member="list.h::stp_node_sortfunc" ref="ga5" 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#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a>)(const void *, const void *)          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -267,19 +258,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="g3bd2f5a42d3313287017bfe20859c2d9"></a><!-- doxytag: member="list.h::stp_list_copy" ref="g3bd2f5a42d3313287017bfe20859c2d9" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga8"></a><!-- doxytag: member="list.h::stp_list_copy" ref="ga8" 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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>* stp_list_copy           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">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>
@@ -298,22 +289,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#gaf10e4bb8ce6a8b6f5f015475400eb1b">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#ga7">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="gaf10e4bb8ce6a8b6f5f015475400eb1b"></a><!-- doxytag: member="list.h::stp_list_create" ref="gaf10e4bb8ce6a8b6f5f015475400eb1b" args="(void)" --><p>
+<a class="anchor" name="ga7"></a><!-- doxytag: member="list.h::stp_list_create" ref="ga7" 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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>* stp_list_create           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -334,11 +325,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="g1382e926901b5efa2356176826a96a1a"></a><!-- doxytag: member="list.h::stp_list_destroy" ref="g1382e926901b5efa2356176826a96a1a" args="(stp_list_t *list)" --><p>
+<a class="anchor" name="ga9"></a><!-- doxytag: member="list.h::stp_list_destroy" ref="ga9" args="(stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -346,7 +337,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">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>
@@ -370,19 +361,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="g310dd79907494b07d9005fbf50b9eb0c"></a><!-- doxytag: member="list.h::stp_list_get_copyfunc" ref="g310dd79907494b07d9005fbf50b9eb0c" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga19"></a><!-- doxytag: member="list.h::stp_list_get_copyfunc" ref="ga19" 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#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a> stp_list_get_copyfunc           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">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>
@@ -406,19 +397,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="g2ef0298e970fdb93955860e7ee3f878c"></a><!-- doxytag: member="list.h::stp_list_get_end" ref="g2ef0298e970fdb93955860e7ee3f878c" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga11"></a><!-- doxytag: member="list.h::stp_list_get_end" ref="ga11" 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#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_get_end           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">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>
@@ -442,19 +433,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="g9d344e3c6874e6033f8fc71370678bcf"></a><!-- doxytag: member="list.h::stp_list_get_freefunc" ref="g9d344e3c6874e6033f8fc71370678bcf" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga17"></a><!-- doxytag: member="list.h::stp_list_get_freefunc" ref="ga17" 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#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a> stp_list_get_freefunc           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">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>
@@ -478,19 +469,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="g9885458dd0f6e6fe5c88c4b2b0643e2a"></a><!-- doxytag: member="list.h::stp_list_get_item_by_index" ref="g9885458dd0f6e6fe5c88c4b2b0643e2a" args="(const stp_list_t *list, int idx)" --><p>
+<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>
 <table 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#g71c64aeca8ca0613215306f088b6a963">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#ga0">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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -524,19 +515,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="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>
+<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>
 <table 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#g71c64aeca8ca0613215306f088b6a963">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#ga0">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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -570,19 +561,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="g0fd0ea2439ab2b0c9b9fb97f14c9a470"></a><!-- doxytag: member="list.h::stp_list_get_item_by_name" ref="g0fd0ea2439ab2b0c9b9fb97f14c9a470" args="(const stp_list_t *list, const char *name)" --><p>
+<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>
 <table 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#g71c64aeca8ca0613215306f088b6a963">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#ga0">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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -616,11 +607,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="g013ca40ec7e5714fc5ee5f31ac5582bc"></a><!-- doxytag: member="list.h::stp_list_get_length" ref="g013ca40ec7e5714fc5ee5f31ac5582bc" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga15"></a><!-- doxytag: member="list.h::stp_list_get_length" ref="ga15" args="(const stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -628,7 +619,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&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="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -652,19 +643,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="ga95d8ace9b6ec71388007024c51865cb"></a><!-- doxytag: member="list.h::stp_list_get_long_namefunc" ref="ga95d8ace9b6ec71388007024c51865cb" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga23"></a><!-- doxytag: member="list.h::stp_list_get_long_namefunc" ref="ga23" 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#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a> stp_list_get_long_namefunc           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">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>
@@ -688,19 +679,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="g468cc0a5dfb1bfbef9eebd8d4f644492"></a><!-- doxytag: member="list.h::stp_list_get_namefunc" ref="g468cc0a5dfb1bfbef9eebd8d4f644492" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga21"></a><!-- doxytag: member="list.h::stp_list_get_namefunc" ref="ga21" 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#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a> stp_list_get_namefunc           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">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>
@@ -724,19 +715,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="ga759fd3cb97b9f651424b8a8fb6bedaa"></a><!-- doxytag: member="list.h::stp_list_get_sortfunc" ref="ga759fd3cb97b9f651424b8a8fb6bedaa" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga25"></a><!-- doxytag: member="list.h::stp_list_get_sortfunc" ref="ga25" 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#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a> stp_list_get_sortfunc           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">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>
@@ -760,19 +751,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="ga67c8173f8c7b2c40e3d6dde6578faec"></a><!-- doxytag: member="list.h::stp_list_get_start" ref="ga67c8173f8c7b2c40e3d6dde6578faec" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga10"></a><!-- doxytag: member="list.h::stp_list_get_start" ref="ga10" 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#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_get_start           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">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>
@@ -796,11 +787,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -808,13 +799,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">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#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>next</em>, </td>
         </tr>
         <tr>
@@ -849,11 +840,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="gde2acf279e8ea067fdc1f3f951d0b373"></a><!-- doxytag: member="list.h::stp_list_item_destroy" ref="gde2acf279e8ea067fdc1f3f951d0b373" args="(stp_list_t *list, stp_list_item_t *item)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -861,13 +852,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">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#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>item</em></td>
         </tr>
         <tr>
@@ -895,11 +886,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="g5b7d8ffea5a806953a43aee961a60fe4"></a><!-- doxytag: member="list.h::stp_list_item_get_data" ref="g5b7d8ffea5a806953a43aee961a60fe4" args="(const stp_list_item_t *item)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -907,7 +898,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#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&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="mdname1" valign="top" nowrap> <em>item</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -931,19 +922,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="gea9c1b6daae518ebecd2981289c555f3"></a><!-- doxytag: member="list.h::stp_list_item_next" ref="gea9c1b6daae518ebecd2981289c555f3" args="(const stp_list_item_t *item)" --><p>
+<a class="anchor" name="ga29"></a><!-- doxytag: member="list.h::stp_list_item_next" ref="ga29" 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#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_item_next           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__list.html#ga0">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>
@@ -967,19 +958,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="gcee23493eafdfcfce51e2ccf29ebbf54"></a><!-- doxytag: member="list.h::stp_list_item_prev" ref="gcee23493eafdfcfce51e2ccf29ebbf54" args="(const stp_list_item_t *item)" --><p>
+<a class="anchor" name="ga28"></a><!-- doxytag: member="list.h::stp_list_item_prev" ref="ga28" 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#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_item_prev           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__list.html#ga0">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>
@@ -1003,11 +994,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="g1b5d2889a81d712c3ba024e53bfd0f38"></a><!-- doxytag: member="list.h::stp_list_item_set_data" ref="g1b5d2889a81d712c3ba024e53bfd0f38" args="(stp_list_item_t *item, void *data)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1015,7 +1006,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#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&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="mdname" nowrap> <em>item</em>, </td>
         </tr>
         <tr>
@@ -1050,11 +1041,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="gb357e17f729e41b4f96d6aada1be26b9"></a><!-- doxytag: member="list.h::stp_list_node_free_data" ref="gb357e17f729e41b4f96d6aada1be26b9" args="(void *item)" --><p>
+<a class="anchor" name="ga6"></a><!-- doxytag: member="list.h::stp_list_node_free_data" ref="ga6" args="(void *item)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1083,13 +1074,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="gec59dd3b87efc811ef2b6303102ed279"></a><!-- doxytag: member="list.h::stp_list_set_copyfunc" ref="gec59dd3b87efc811ef2b6303102ed279" args="(stp_list_t *list, stp_node_copyfunc copyfunc)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1097,13 +1088,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">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#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>copyfunc</em></td>
         </tr>
         <tr>
@@ -1128,13 +1119,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="gc103cb4ff8870b3a8d90b6ebcade2498"></a><!-- doxytag: member="list.h::stp_list_set_freefunc" ref="gc103cb4ff8870b3a8d90b6ebcade2498" args="(stp_list_t *list, stp_node_freefunc freefunc)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1142,13 +1133,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">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#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#ga2">stp_node_freefunc</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>freefunc</em></td>
         </tr>
         <tr>
@@ -1173,13 +1164,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="g42bdba5fcb861bdf8facb9135039d9b8"></a><!-- doxytag: member="list.h::stp_list_set_long_namefunc" ref="g42bdba5fcb861bdf8facb9135039d9b8" args="(stp_list_t *list, stp_node_namefunc long_namefunc)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1187,13 +1178,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">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#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>long_namefunc</em></td>
         </tr>
         <tr>
@@ -1218,13 +1209,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="g97d7c6d659aa7d05bc54a349a07e10c0"></a><!-- doxytag: member="list.h::stp_list_set_namefunc" ref="g97d7c6d659aa7d05bc54a349a07e10c0" args="(stp_list_t *list, stp_node_namefunc namefunc)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1232,13 +1223,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">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#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>namefunc</em></td>
         </tr>
         <tr>
@@ -1263,13 +1254,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="gbad08ce8ef257dae054ea3816ae88fe7"></a><!-- doxytag: member="list.h::stp_list_set_sortfunc" ref="gbad08ce8ef257dae054ea3816ae88fe7" args="(stp_list_t *list, stp_node_sortfunc sortfunc)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1277,13 +1268,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">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#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>sortfunc</em></td>
         </tr>
         <tr>
@@ -1308,14 +1299,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html
index d1284da..088a171 100644
--- a/doc/gutenprint/html/group__papersize.html
+++ b/doc/gutenprint/html/group__papersize.html
@@ -2,18 +2,9 @@
 <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.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>
+<!-- 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>
 <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>
@@ -22,40 +13,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#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>
+<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>
  }</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 class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#ga5">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#g93eb4d6bc44914b3ea6b184e076a0853">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#ga0">stp_known_papersizes</a> (void)</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 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 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 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 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 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 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>
+<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>
 
 </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="gbb66a8f6ce85d70afd9fe42472b492d8"></a><!-- doxytag: member="paper.h::stp_papersize_unit_t" ref="gbb66a8f6ce85d70afd9fe42472b492d8" args="" --><p>
+<a class="anchor" name="ga5"></a><!-- doxytag: member="paper.h::stp_papersize_unit_t" ref="ga5" 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#gbb66a8f6ce85d70afd9fe42472b492d8">stp_papersize_unit_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -73,13 +64,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="ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_STANDARD" ref="ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65" args="" -->PAPERSIZE_ENGLISH_STANDARD</em>&nbsp;</td><td>
+<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>
 English/Imperial units. </td></tr>
-<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>
+<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>
 Metric units. </td></tr>
-<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>
+<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>
 English/Imperial units (optional paper, not displayed by default). </td></tr>
-<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>
+<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>
 Metric units (optional paper, not displayed by default). </td></tr>
 </table>
 </dl>
@@ -87,7 +78,7 @@ Metric units (optional paper, not displayed by default). </td></tr>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -95,7 +86,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -130,7 +121,7 @@ Metric units (optional paper, not displayed by default). </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="g08bb891f58a7decfee2b073c00715993"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_index" ref="g08bb891f58a7decfee2b073c00715993" args="(int idx)" --><p>
+<a class="anchor" name="ga3"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_index" ref="ga3" args="(int idx)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -162,11 +153,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="g9d655e3de6954ad3c5933dc736d2509a"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_name" ref="g9d655e3de6954ad3c5933dc736d2509a" args="(const char *name)" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_name" ref="ga1" args="(const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -198,11 +189,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="g0438b0e4729f37579900b591e801f8ce"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_size" ref="g0438b0e4729f37579900b591e801f8ce" args="(int length, int width)" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_size" ref="ga2" args="(int length, int width)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -244,11 +235,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="g93eb4d6bc44914b3ea6b184e076a0853"></a><!-- doxytag: member="paper.h::stp_known_papersizes" ref="g93eb4d6bc44914b3ea6b184e076a0853" args="(void)" --><p>
+<a class="anchor" name="ga0"></a><!-- doxytag: member="paper.h::stp_known_papersizes" ref="ga0" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -275,12 +266,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html
index 2f8ef0c..275fc19 100644
--- a/doc/gutenprint/html/group__printer.html
+++ b/doc/gutenprint/html/group__printer.html
@@ -2,18 +2,9 @@
 <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.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>
+<!-- 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>
 <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>
@@ -23,82 +14,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#g1a68662b730d44c11de6fb8226a309f6">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#ga0">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="#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 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 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#gc0a8108170f5c86621de14296fd94b1e">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#ga2">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="#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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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">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">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">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">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">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">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="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="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#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#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#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#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">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">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">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"><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"><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">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">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">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>
+<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>
 
 </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="g5c0458c3c1d19474e0245c47dac29e70"></a><!-- doxytag: member="printers.h::stp_family_t" ref="g5c0458c3c1d19474e0245c47dac29e70" 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="ga1"></a><!-- doxytag: member="printers.h::stp_family_t" ref="ga1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -121,13 +112,13 @@ A particular printer model must selected in order to be able to print. Each prin
     </td>
   </tr>
 </table>
-<a class="anchor" name="g1a68662b730d44c11de6fb8226a309f6"></a><!-- doxytag: member="printers.h::stp_printer_t" ref="g1a68662b730d44c11de6fb8226a309f6" args="" --><p>
+<a class="anchor" name="ga0"></a><!-- doxytag: member="printers.h::stp_printer_t" ref="ga0" 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#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_printer <a class="el" href="group__printer.html#ga0">stp_printer_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -147,7 +138,7 @@ The printer opaque data type (representation of printer model).
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="g950e2cd193926440ba250dbc184d8588"></a><!-- doxytag: member="printers.h::stp_describe_output" ref="g950e2cd193926440ba250dbc184d8588" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga25"></a><!-- doxytag: member="printers.h::stp_describe_output" ref="ga25" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -155,7 +146,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -175,7 +166,7 @@ The printer opaque data type (representation of printer model).
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -183,7 +174,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -217,11 +208,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="g82b22438444849bdedb4cfbe22f209e8"></a><!-- doxytag: member="printers.h::stp_family_register" ref="g82b22438444849bdedb4cfbe22f209e8" args="(stp_list_t *family)" --><p>
+<a class="anchor" name="ga20"></a><!-- doxytag: member="printers.h::stp_family_register" ref="ga20" args="(stp_list_t *family)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -229,7 +220,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">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>
@@ -249,7 +240,7 @@ End a print job.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2ab30a5e5442b7a552fc3b884e1511b"></a><!-- doxytag: member="printers.h::stp_family_unregister" ref="ga2ab30a5e5442b7a552fc3b884e1511b" args="(stp_list_t *family)" --><p>
+<a class="anchor" name="ga21"></a><!-- doxytag: member="printers.h::stp_family_unregister" ref="ga21" args="(stp_list_t *family)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -257,7 +248,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">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>
@@ -277,7 +268,7 @@ End a print job.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gc09e99e20c8a19a13a5fb6356742a92a"></a><!-- doxytag: member="printers.h::stp_get_model_id" ref="gc09e99e20c8a19a13a5fb6356742a92a" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga18"></a><!-- doxytag: member="printers.h::stp_get_model_id" ref="ga18" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -285,7 +276,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -305,15 +296,15 @@ End a print job.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gcb4cdcada01ff29c5fd4ffeaa576db9e"></a><!-- doxytag: member="printers.h::stp_get_printer" ref="gcb4cdcada01ff29c5fd4ffeaa576db9e" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga6"></a><!-- doxytag: member="printers.h::stp_get_printer" ref="ga6" 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#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a>* stp_get_printer           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">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>
@@ -337,17 +328,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="g947fa230e08f9c854ca2608e76bd0d58"></a><!-- doxytag: member="printers.h::stp_get_printer_by_driver" ref="g947fa230e08f9c854ca2608e76bd0d58" args="(const char *driver)" --><p>
+<a class="anchor" name="ga5"></a><!-- doxytag: member="printers.h::stp_get_printer_by_driver" ref="ga5" 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#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a>* stp_get_printer_by_driver           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const char *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>driver</em>          </td>
@@ -373,17 +364,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="g1286559c60d239563f9f15fdd27996e0"></a><!-- doxytag: member="printers.h::stp_get_printer_by_index" ref="g1286559c60d239563f9f15fdd27996e0" args="(int idx)" --><p>
+<a class="anchor" name="ga3"></a><!-- doxytag: member="printers.h::stp_get_printer_by_index" ref="ga3" 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#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a>* stp_get_printer_by_index           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">int&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>idx</em>          </td>
@@ -409,17 +400,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="gc041944e528afcb9a795eb6ece3fc6ff"></a><!-- doxytag: member="printers.h::stp_get_printer_by_long_name" ref="gc041944e528afcb9a795eb6ece3fc6ff" args="(const char *long_name)" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="printers.h::stp_get_printer_by_long_name" ref="ga4" 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#g1a68662b730d44c11de6fb8226a309f6">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#ga0">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>
@@ -445,11 +436,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="g6f32b0213b580bf081fc8752a3eb04a1"></a><!-- doxytag: member="printers.h::stp_get_printer_index_by_driver" ref="g6f32b0213b580bf081fc8752a3eb04a1" args="(const char *driver)" --><p>
+<a class="anchor" name="ga7"></a><!-- doxytag: member="printers.h::stp_get_printer_index_by_driver" ref="ga7" args="(const char *driver)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -476,17 +467,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. <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.</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>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>
+<dl compact><dt><b>Returns:</b></dt><dd>the index number, or -1 on failure.</dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="gc9aba62164667822fd9f110740bab570"></a><!-- doxytag: member="printers.h::stp_initialize_printer_defaults" ref="gc9aba62164667822fd9f110740bab570" args="(void)" --><p>
+<a class="anchor" name="ga22"></a><!-- doxytag: member="printers.h::stp_initialize_printer_defaults" ref="ga22" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -514,7 +505,7 @@ Get the printer index number from the printer model short (driver) name.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -522,7 +513,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -557,11 +548,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -569,7 +560,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -604,15 +595,15 @@ Print the image.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ge67398e65540b835f5c5d073c5ea0ec1"></a><!-- doxytag: member="printers.h::stp_printer_get_defaults" ref="ge67398e65540b835f5c5d073c5ea0ec1" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="ga13"></a><!-- doxytag: member="printers.h::stp_printer_get_defaults" ref="ga13" 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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a>* stp_printer_get_defaults           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">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>
@@ -636,11 +627,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="g6c6c426f86307660079277ab6e90ae3d"></a><!-- doxytag: member="printers.h::stp_printer_get_driver" ref="g6c6c426f86307660079277ab6e90ae3d" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="ga9"></a><!-- doxytag: member="printers.h::stp_printer_get_driver" ref="ga9" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -648,7 +639,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#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&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="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -672,11 +663,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="g9c98ccc58b2c6f9ed6bd1025220ff77d"></a><!-- doxytag: member="printers.h::stp_printer_get_family" ref="g9c98ccc58b2c6f9ed6bd1025220ff77d" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="ga10"></a><!-- doxytag: member="printers.h::stp_printer_get_family" ref="ga10" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -684,7 +675,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#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&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="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -708,11 +699,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="g00182878bdc39935e6382d7e41d55294"></a><!-- doxytag: member="printers.h::stp_printer_get_long_name" ref="g00182878bdc39935e6382d7e41d55294" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="ga8"></a><!-- doxytag: member="printers.h::stp_printer_get_long_name" ref="ga8" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -720,7 +711,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#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&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="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -744,11 +735,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="gfc0382fd32b49ea9d171e4ce8b750c62"></a><!-- doxytag: member="printers.h::stp_printer_get_manufacturer" ref="gfc0382fd32b49ea9d171e4ce8b750c62" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="ga11"></a><!-- doxytag: member="printers.h::stp_printer_get_manufacturer" ref="ga11" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -756,7 +747,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#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&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="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -780,11 +771,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="g7ba104f0ea5ce4a88175486894010b71"></a><!-- doxytag: member="printers.h::stp_printer_get_model" ref="g7ba104f0ea5ce4a88175486894010b71" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="ga12"></a><!-- doxytag: member="printers.h::stp_printer_get_model" ref="ga12" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -792,7 +783,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#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&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="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -816,19 +807,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="g666486047edfe4405d003b5c3bbe4b49"></a><!-- doxytag: member="printers.h::stp_printer_list_parameters" ref="g666486047edfe4405d003b5c3bbe4b49" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga23"></a><!-- doxytag: member="printers.h::stp_printer_list_parameters" ref="ga23" 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> stp_printer_list_parameters           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">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>
@@ -848,7 +839,7 @@ The model number is used internally by the "family" driver module, and has no me
     </td>
   </tr>
 </table>
-<a class="anchor" name="gc0a8108170f5c86621de14296fd94b1e"></a><!-- doxytag: member="printers.h::stp_printer_model_count" ref="gc0a8108170f5c86621de14296fd94b1e" args="(void)" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="printers.h::stp_printer_model_count" ref="ga2" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -875,11 +866,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="gc3d8cdb65382cb13ea6b01072e6240d5"></a><!-- doxytag: member="printers.h::stp_set_printer_defaults" ref="gc3d8cdb65382cb13ea6b01072e6240d5" args="(stp_vars_t *v, const stp_printer_t *p)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -887,13 +878,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>p</em></td>
         </tr>
         <tr>
@@ -918,13 +909,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="g9cf59fba866430dd47508bac6561ef67"></a><!-- doxytag: member="printers.h::stp_start_job" ref="g9cf59fba866430dd47508bac6561ef67" args="(const stp_vars_t *v, stp_image_t *image)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -932,7 +923,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -960,18 +951,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#g121125e6646c6f6d8965f1857450749e">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#ga15">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="gd91f8e7a622725f0d47196cf912ddd8d"></a><!-- doxytag: member="printers.h::stp_verify_printer_params" ref="gd91f8e7a622725f0d47196cf912ddd8d" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="ga19"></a><!-- doxytag: member="printers.h::stp_verify_printer_params" ref="ga19" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -979,7 +970,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -999,8 +990,8 @@ Start a print job.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html
index c9df74c..857f0f9 100644
--- a/doc/gutenprint/html/group__sequence.html
+++ b/doc/gutenprint/html/group__sequence.html
@@ -2,122 +2,113 @@
 <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.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>
+<!-- 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>
 <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#gb3d4cae653c4303a6e5d26b516694c92">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#ga0">stp_sequence_t</a></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 class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="#ga0"></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#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="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="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">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">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">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">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 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 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">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">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">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">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 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 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">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">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">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">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">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">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 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 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">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">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">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">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">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">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">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">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 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 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 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 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 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 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 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 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 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 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 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 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">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">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 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 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 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 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 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 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 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 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 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 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 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 unsigned short data.  <a href="#g8bf46faeea891ac7ca699591df596bc1"></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="#ga28"></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="gb3d4cae653c4303a6e5d26b516694c92"></a><!-- doxytag: member="sequence.h::stp_sequence_t" ref="gb3d4cae653c4303a6e5d26b516694c92" args="" --><p>
+<a class="anchor" name="ga0"></a><!-- doxytag: member="sequence.h::stp_sequence_t" ref="ga0" 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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_sequence <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -137,7 +128,7 @@ The sequence opaque data type.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -145,13 +136,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>source</em></td>
         </tr>
         <tr>
@@ -173,22 +164,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#g771327bed5a71d8d33cc6b3ec5cbdbee">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#ga1">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="g771327bed5a71d8d33cc6b3ec5cbdbee"></a><!-- doxytag: member="sequence.h::stp_sequence_create" ref="g771327bed5a71d8d33cc6b3ec5cbdbee" args="(void)" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="sequence.h::stp_sequence_create" ref="ga1" 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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>* stp_sequence_create           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -209,19 +200,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="gd37eb66db88ac93b853ba6e02b9155bc"></a><!-- doxytag: member="sequence.h::stp_sequence_create_copy" ref="gd37eb66db88ac93b853ba6e02b9155bc" args="(const stp_sequence_t *sequence)" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="sequence.h::stp_sequence_create_copy" ref="ga4" 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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>* stp_sequence_create_copy           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">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>
@@ -240,16 +231,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#g771327bed5a71d8d33cc6b3ec5cbdbee">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#ga1">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="g98c9c2859d2ebe9b1987d26b62bd6ce0"></a><!-- doxytag: member="sequence.h::stp_sequence_destroy" ref="g98c9c2859d2ebe9b1987d26b62bd6ce0" args="(stp_sequence_t *sequence)" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="sequence.h::stp_sequence_destroy" ref="ga2" args="(stp_sequence_t *sequence)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -257,7 +248,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">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>
@@ -278,13 +269,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="g392e1da122d95d6fc07b6d73eff1d311"></a><!-- doxytag: member="sequence.h::stp_sequence_get_bounds" ref="g392e1da122d95d6fc07b6d73eff1d311" args="(const stp_sequence_t *sequence, double *low, double *high)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -292,7 +283,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -330,13 +321,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -344,7 +335,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -382,17 +373,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#gb3d4cae653c4303a6e5d26b516694c92">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#ga0">stp_sequence_t</a> *sequence;
  size_t size;
  <span class="keywordtype">double</span> *data;
- <a class="code" href="group__sequence.html#gc33208fae031bd1111f8ceb4c1425199">stp_sequence_get_data</a>(sequence, &amp;size, &amp;data);
-</pre></div> </td></tr>
+ <a class="code" href="group__sequence.html#ga12">stp_sequence_get_data</a>(sequence, &amp;size, &amp;data);
+</pre></div></td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -400,7 +391,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -434,11 +425,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="g4396baf0d338eec6f3bce3e2000da978"></a><!-- doxytag: member="sequence.h::stp_sequence_get_int_data" ref="g4396baf0d338eec6f3bce3e2000da978" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -446,7 +437,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -480,11 +471,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="g864b55caa3a8c0e573031a36f57f7cc4"></a><!-- doxytag: member="sequence.h::stp_sequence_get_long_data" ref="g864b55caa3a8c0e573031a36f57f7cc4" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -492,7 +483,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -526,11 +517,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="g044210129f28c298152ce124371324d4"></a><!-- doxytag: member="sequence.h::stp_sequence_get_point" ref="g044210129f28c298152ce124371324d4" args="(const stp_sequence_t *sequence, size_t where, double *data)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -538,7 +529,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -579,11 +570,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="gc2c70c539a3eced45be306d082faa3a6"></a><!-- doxytag: member="sequence.h::stp_sequence_get_range" ref="gc2c70c539a3eced45be306d082faa3a6" args="(const stp_sequence_t *sequence, double *low, double *high)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -591,7 +582,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -629,13 +620,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="g91a68efd6b99150739c7706f65703a2f"></a><!-- doxytag: member="sequence.h::stp_sequence_get_short_data" ref="g91a68efd6b99150739c7706f65703a2f" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -643,7 +634,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -677,11 +668,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="g99292c5ba10bcf1574c3e71a593c3e5f"></a><!-- doxytag: member="sequence.h::stp_sequence_get_size" ref="g99292c5ba10bcf1574c3e71a593c3e5f" args="(const stp_sequence_t *sequence)" --><p>
+<a class="anchor" name="ga9"></a><!-- doxytag: member="sequence.h::stp_sequence_get_size" ref="ga9" args="(const stp_sequence_t *sequence)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -689,7 +680,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname1" valign="top" nowrap> <em>sequence</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -708,11 +699,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="g204f77e91c9283dc6ec6e742687bb0db"></a><!-- doxytag: member="sequence.h::stp_sequence_get_uint_data" ref="g204f77e91c9283dc6ec6e742687bb0db" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -720,7 +711,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -754,11 +745,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="gc4557b9fba98a7fbb4e17cc18fb0dded"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ulong_data" ref="gc4557b9fba98a7fbb4e17cc18fb0dded" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -766,7 +757,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -800,11 +791,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="g8bf46faeea891ac7ca699591df596bc1"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ushort_data" ref="g8bf46faeea891ac7ca699591df596bc1" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -812,7 +803,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -846,11 +837,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="gd56df3112937c11431e033f2d9574b96"></a><!-- doxytag: member="sequence.h::stp_sequence_set_bounds" ref="gd56df3112937c11431e033f2d9574b96" args="(stp_sequence_t *sequence, double low, double high)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -858,7 +849,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -899,11 +890,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="g24024e771a50db02f2713b244212603e"></a><!-- doxytag: member="sequence.h::stp_sequence_set_data" ref="g24024e771a50db02f2713b244212603e" args="(stp_sequence_t *sequence, size_t count, const double *data)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -911,7 +902,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -952,11 +943,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -964,7 +955,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1005,11 +996,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1017,7 +1008,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1058,11 +1049,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1070,7 +1061,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1111,11 +1102,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="gf7f49101192387e29399ded6d3166d13"></a><!-- doxytag: member="sequence.h::stp_sequence_set_point" ref="gf7f49101192387e29399ded6d3166d13" args="(stp_sequence_t *sequence, size_t where, double data)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1123,7 +1114,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1164,11 +1155,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1176,7 +1167,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1217,11 +1208,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="g166e9a610bd53cb812e328d9e111f240"></a><!-- doxytag: member="sequence.h::stp_sequence_set_size" ref="g166e9a610bd53cb812e328d9e111f240" args="(stp_sequence_t *sequence, size_t size)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1229,7 +1220,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1263,11 +1254,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1275,7 +1266,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1323,11 +1314,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1335,7 +1326,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1376,11 +1367,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1388,7 +1379,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1429,11 +1420,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1441,7 +1432,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1482,12 +1473,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html
index 803f27c..4cae95c 100644
--- a/doc/gutenprint/html/group__util.html
+++ b/doc/gutenprint/html/group__util.html
@@ -2,143 +2,134 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#g44a234fbf1ab832399fc674c8cb53b1f">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#ga54">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#g69354e5830712093045a4ba290a298f8">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#ga0">stp_init</a> (void)</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">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">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="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="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#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#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#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#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&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 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 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&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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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&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 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&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 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&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 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">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">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">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">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&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 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&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 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 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&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#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#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#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#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#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#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#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#gabf89ff6213b9dc568fbdd1342b663ad">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#ga27">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#g054943d301baecba82cdb78b7e454880">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#ga28">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#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#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#g2f861f4a98ad496ca8cd995147867f32">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#ga30">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#g77022a2cfde3a9ba9269f1bc3726175c">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#ga31">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="#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 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 release version string (x.y).  <a href="#ged2a65d98cba1fd6d48c0cc1b611ae0f"></a><br></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>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Utility functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga0d6b1a8d780b3c5f970454678bc0323"></a><!-- doxytag: member="util.h::STP_DBG_CANON" ref="ga0d6b1a8d780b3c5f970454678bc0323" args="" --><p>
+<a class="anchor" name="ga39"></a><!-- doxytag: member="util.h::STP_DBG_CANON" ref="ga39" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -161,7 +152,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g3560e33ba80d2a0ceb07fe51fac845be"></a><!-- doxytag: member="util.h::STP_DBG_COLORFUNC" ref="g3560e33ba80d2a0ceb07fe51fac845be" args="" --><p>
+<a class="anchor" name="ga34"></a><!-- doxytag: member="util.h::STP_DBG_COLORFUNC" ref="ga34" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -184,7 +175,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g9eaf8d50f127cd4316bf68ad34092551"></a><!-- doxytag: member="util.h::STP_DBG_CURVE" ref="g9eaf8d50f127cd4316bf68ad34092551" args="" --><p>
+<a class="anchor" name="ga52"></a><!-- doxytag: member="util.h::STP_DBG_CURVE" ref="ga52" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -207,7 +198,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gc80b8553e636ec01fe4e975d9f7668b9"></a><!-- doxytag: member="util.h::STP_DBG_CURVE_ERRORS" ref="gc80b8553e636ec01fe4e975d9f7668b9" args="" --><p>
+<a class="anchor" name="ga53"></a><!-- doxytag: member="util.h::STP_DBG_CURVE_ERRORS" ref="ga53" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -230,7 +221,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g158e1ea4acff071440681ba678b6fb0b"></a><!-- doxytag: member="util.h::STP_DBG_ESCP2" ref="g158e1ea4acff071440681ba678b6fb0b" args="" --><p>
+<a class="anchor" name="ga38"></a><!-- doxytag: member="util.h::STP_DBG_ESCP2" ref="ga38" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -253,7 +244,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g328a4b66d0767134649ce30b243931c9"></a><!-- doxytag: member="util.h::STP_DBG_INK" ref="g328a4b66d0767134649ce30b243931c9" args="" --><p>
+<a class="anchor" name="ga35"></a><!-- doxytag: member="util.h::STP_DBG_INK" ref="ga35" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -276,7 +267,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gb8180ab505c2d7c5a717a53096ac770c"></a><!-- doxytag: member="util.h::STP_DBG_LEXMARK" ref="gb8180ab505c2d7c5a717a53096ac770c" args="" --><p>
+<a class="anchor" name="ga40"></a><!-- doxytag: member="util.h::STP_DBG_LEXMARK" ref="ga40" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -299,7 +290,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gcb3d85de1088cf795cfeaa9e1450c4e0"></a><!-- doxytag: member="util.h::STP_DBG_LIST" ref="gcb3d85de1088cf795cfeaa9e1450c4e0" args="" --><p>
+<a class="anchor" name="ga44"></a><!-- doxytag: member="util.h::STP_DBG_LIST" ref="ga44" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -322,7 +313,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g9ef88b326f83d342849fa89c33c7e4a7"></a><!-- doxytag: member="util.h::STP_DBG_LUT" ref="g9ef88b326f83d342849fa89c33c7e4a7" args="" --><p>
+<a class="anchor" name="ga33"></a><!-- doxytag: member="util.h::STP_DBG_LUT" ref="ga33" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -345,7 +336,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g9c8f6255efb1fcf9cd3e7a68466e44ba"></a><!-- doxytag: member="util.h::STP_DBG_MARK_FILE" ref="g9c8f6255efb1fcf9cd3e7a68466e44ba" args="" --><p>
+<a class="anchor" name="ga43"></a><!-- doxytag: member="util.h::STP_DBG_MARK_FILE" ref="ga43" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -368,7 +359,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g6d69d079a3d7a3e0e2b870e1e9417187"></a><!-- doxytag: member="util.h::STP_DBG_MODULE" ref="g6d69d079a3d7a3e0e2b870e1e9417187" args="" --><p>
+<a class="anchor" name="ga45"></a><!-- doxytag: member="util.h::STP_DBG_MODULE" ref="ga45" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -391,7 +382,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g4dc6609c9bb0c256fec7361f41a5c45f"></a><!-- doxytag: member="util.h::STP_DBG_OLYMPUS" ref="g4dc6609c9bb0c256fec7361f41a5c45f" args="" --><p>
+<a class="anchor" name="ga51"></a><!-- doxytag: member="util.h::STP_DBG_OLYMPUS" ref="ga51" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -414,7 +405,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g08f48f3423e848f1932435c5f8e94ff7"></a><!-- doxytag: member="util.h::STP_DBG_PAPER" ref="g08f48f3423e848f1932435c5f8e94ff7" args="" --><p>
+<a class="anchor" name="ga47"></a><!-- doxytag: member="util.h::STP_DBG_PAPER" ref="ga47" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -437,7 +428,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gb11ef5f0ed150be2d3b999b7fc7e4f24"></a><!-- doxytag: member="util.h::STP_DBG_PATH" ref="gb11ef5f0ed150be2d3b999b7fc7e4f24" args="" --><p>
+<a class="anchor" name="ga46"></a><!-- doxytag: member="util.h::STP_DBG_PATH" ref="ga46" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -460,7 +451,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g30a9efd31b78debefd550d0b337ec795"></a><!-- doxytag: member="util.h::STP_DBG_PCL" ref="g30a9efd31b78debefd550d0b337ec795" args="" --><p>
+<a class="anchor" name="ga37"></a><!-- doxytag: member="util.h::STP_DBG_PCL" ref="ga37" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -483,7 +474,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g7bbbf3d31a1a4f6b0da808184e1c1587"></a><!-- doxytag: member="util.h::STP_DBG_PRINTERS" ref="g7bbbf3d31a1a4f6b0da808184e1c1587" args="" --><p>
+<a class="anchor" name="ga48"></a><!-- doxytag: member="util.h::STP_DBG_PRINTERS" ref="ga48" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -506,7 +497,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g8d8211f97675b37f18bff822757d04b3"></a><!-- doxytag: member="util.h::STP_DBG_PS" ref="g8d8211f97675b37f18bff822757d04b3" args="" --><p>
+<a class="anchor" name="ga36"></a><!-- doxytag: member="util.h::STP_DBG_PS" ref="ga36" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -529,7 +520,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gb764d477ebf0db4957cc316badac70bd"></a><!-- doxytag: member="util.h::STP_DBG_ROWS" ref="gb764d477ebf0db4957cc316badac70bd" args="" --><p>
+<a class="anchor" name="ga42"></a><!-- doxytag: member="util.h::STP_DBG_ROWS" ref="ga42" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -552,7 +543,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g52844a51058ca29f975b5666743622ac"></a><!-- doxytag: member="util.h::STP_DBG_VARS" ref="g52844a51058ca29f975b5666743622ac" args="" --><p>
+<a class="anchor" name="ga50"></a><!-- doxytag: member="util.h::STP_DBG_VARS" ref="ga50" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -575,7 +566,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gc746369f247dc346bcbdeacb1abbdbcb"></a><!-- doxytag: member="util.h::STP_DBG_WEAVE_PARAMS" ref="gc746369f247dc346bcbdeacb1abbdbcb" args="" --><p>
+<a class="anchor" name="ga41"></a><!-- doxytag: member="util.h::STP_DBG_WEAVE_PARAMS" ref="ga41" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -598,7 +589,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g51aee81a3d2a33d42417f6b61bb63f5e"></a><!-- doxytag: member="util.h::STP_DBG_XML" ref="g51aee81a3d2a33d42417f6b61bb63f5e" args="" --><p>
+<a class="anchor" name="ga49"></a><!-- doxytag: member="util.h::STP_DBG_XML" ref="ga49" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -621,7 +612,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g44a234fbf1ab832399fc674c8cb53b1f"></a><!-- doxytag: member="util.h::STP_SAFE_FREE" ref="g44a234fbf1ab832399fc674c8cb53b1f" args="(x)" --><p>
+<a class="anchor" name="ga54"></a><!-- doxytag: member="util.h::STP_SAFE_FREE" ref="ga54" args="(x)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -649,14 +640,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#gabf89ff6213b9dc568fbdd1342b663ad">stp_free</a>((<span class="keywordtype">char</span> *)(x));                      \
+    <a class="code" href="group__util.html#ga27">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="g9b6b2745ee2d68d1ca356a79c50f0ed7"></a><!-- doxytag: member="util.h::stp_abort" ref="g9b6b2745ee2d68d1ca356a79c50f0ed7" args="(void)" --><p>
+<a class="anchor" name="ga3"></a><!-- doxytag: member="util.h::stp_abort" ref="ga3" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -684,7 +675,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g6bdd7099220fe310b228dcff5159b8d9"></a><!-- doxytag: member="util.h::stp_asprintf" ref="g6bdd7099220fe310b228dcff5159b8d9" args="(char **strp, const char *format,...) __attribute__((format(__printf__" --><p>
+<a class="anchor" name="ga17"></a><!-- doxytag: member="util.h::stp_asprintf" ref="ga17" args="(char **strp, const char *format,...) __attribute__((format(__printf__" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -727,7 +718,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g34d3ebda7c5b75ab40d1600f4d79a4be"></a><!-- doxytag: member="util.h::stp_catprintf" ref="g34d3ebda7c5b75ab40d1600f4d79a4be" args="(char **strp, const char *format,...) __attribute__((format(__printf__" --><p>
+<a class="anchor" name="ga18"></a><!-- doxytag: member="util.h::stp_catprintf" ref="ga18" args="(char **strp, const char *format,...) __attribute__((format(__printf__" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -770,7 +761,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -813,7 +804,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -827,7 +818,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -862,7 +853,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -870,7 +861,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -905,7 +896,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g5f6389ed7d500f851cabe8425a158e4b"></a><!-- doxytag: member="util.h::stp_erprintf" ref="g5f6389ed7d500f851cabe8425a158e4b" args="(const char *format,...) __attribute__((format(__printf__" --><p>
+<a class="anchor" name="ga16"></a><!-- doxytag: member="util.h::stp_erprintf" ref="ga16" args="(const char *format,...) __attribute__((format(__printf__" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -942,7 +933,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g859b75eddde620338859121451096097"></a><!-- doxytag: member="util.h::stp_erputc" ref="g859b75eddde620338859121451096097" args="(int ch)" --><p>
+<a class="anchor" name="ga14"></a><!-- doxytag: member="util.h::stp_erputc" ref="ga14" args="(int ch)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -970,7 +961,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gf39c22b74843750ca74a6caccb263c7c"></a><!-- doxytag: member="util.h::stp_flush_debug_messages" ref="gf39c22b74843750ca74a6caccb263c7c" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="ga23"></a><!-- doxytag: member="util.h::stp_flush_debug_messages" ref="ga23" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -978,7 +969,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -998,7 +989,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gabf89ff6213b9dc568fbdd1342b663ad"></a><!-- doxytag: member="util.h::stp_free" ref="gabf89ff6213b9dc568fbdd1342b663ad" args="(void *ptr)" --><p>
+<a class="anchor" name="ga27"></a><!-- doxytag: member="util.h::stp_free" ref="ga27" args="(void *ptr)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1026,7 +1017,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g9ab4c35dd4b6e142281ff36ecedee27e"></a><!-- doxytag: member="util.h::stp_get_debug_level" ref="g9ab4c35dd4b6e142281ff36ecedee27e" args="(void)" --><p>
+<a class="anchor" name="ga19"></a><!-- doxytag: member="util.h::stp_get_debug_level" ref="ga19" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1054,7 +1045,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ged2a65d98cba1fd6d48c0cc1b611ae0f"></a><!-- doxytag: member="util.h::stp_get_release_version" ref="ged2a65d98cba1fd6d48c0cc1b611ae0f" args="(void)" --><p>
+<a class="anchor" name="ga32"></a><!-- doxytag: member="util.h::stp_get_release_version" ref="ga32" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1081,11 +1072,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="g77022a2cfde3a9ba9269f1bc3726175c"></a><!-- doxytag: member="util.h::stp_get_version" ref="g77022a2cfde3a9ba9269f1bc3726175c" args="(void)" --><p>
+<a class="anchor" name="ga31"></a><!-- doxytag: member="util.h::stp_get_version" ref="ga31" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1112,11 +1103,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="g69354e5830712093045a4ba290a298f8"></a><!-- doxytag: member="util.h::stp_init" ref="g69354e5830712093045a4ba290a298f8" args="(void)" --><p>
+<a class="anchor" name="ga0"></a><!-- doxytag: member="util.h::stp_init" ref="ga0" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1143,11 +1134,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="g26a43ceec27ca34bc49f4806900b4618"></a><!-- doxytag: member="util.h::stp_init_debug_messages" ref="g26a43ceec27ca34bc49f4806900b4618" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="ga22"></a><!-- doxytag: member="util.h::stp_init_debug_messages" ref="ga22" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1155,7 +1146,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -1175,7 +1166,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="g7c76d059684ee6dc5bdc06e4b3af18ef"></a><!-- doxytag: member="util.h::stp_malloc" ref="g7c76d059684ee6dc5bdc06e4b3af18ef" args="(size_t)" --><p>
+<a class="anchor" name="ga24"></a><!-- doxytag: member="util.h::stp_malloc" ref="ga24" args="(size_t)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1203,7 +1194,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="gf64336e7c536a51d0debe88f1f5ec90a"></a><!-- doxytag: member="util.h::stp_prune_inactive_options" ref="gf64336e7c536a51d0debe88f1f5ec90a" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="util.h::stp_prune_inactive_options" ref="ga4" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1211,7 +1202,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -1231,7 +1222,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1245,7 +1236,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1268,7 +1259,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1282,7 +1273,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1305,7 +1296,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1319,7 +1310,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1342,7 +1333,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1356,7 +1347,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1379,7 +1370,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="gf07e31a63021b4d504cc5a410e1aeb08"></a><!-- doxytag: member="util.h::stp_putc" ref="gf07e31a63021b4d504cc5a410e1aeb08" args="(int ch, const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga7"></a><!-- doxytag: member="util.h::stp_putc" ref="ga7" args="(int ch, const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1393,7 +1384,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1416,7 +1407,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="g0a59761c8a4ee5f31cfb9bec2a9b00b4"></a><!-- doxytag: member="util.h::stp_puts" ref="g0a59761c8a4ee5f31cfb9bec2a9b00b4" args="(const char *s, const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga12"></a><!-- doxytag: member="util.h::stp_puts" ref="ga12" args="(const char *s, const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1430,7 +1421,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1453,13 +1444,13 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_read_and_compose_curves           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const char *&nbsp;</td>
           <td class="mdname" nowrap> <em>s1</em>, </td>
@@ -1473,7 +1464,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#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>comp</em>, </td>
         </tr>
         <tr>
@@ -1502,7 +1493,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="g908f11aeabf31c8a9621bd65d408a5fc"></a><!-- doxytag: member="util.h::stp_realloc" ref="g908f11aeabf31c8a9621bd65d408a5fc" args="(void *ptr, size_t)" --><p>
+<a class="anchor" name="ga26"></a><!-- doxytag: member="util.h::stp_realloc" ref="ga26" args="(void *ptr, size_t)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1539,7 +1530,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1547,7 +1538,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1588,7 +1579,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="gf7978ce9e414b3d8ad905ee36a51cfbd"></a><!-- doxytag: member="util.h::stp_set_output_codeset" ref="gf7978ce9e414b3d8ad905ee36a51cfbd" args="(const char *codeset)" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="util.h::stp_set_output_codeset" ref="ga1" args="(const char *codeset)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1620,11 +1611,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="g2f861f4a98ad496ca8cd995147867f32"></a><!-- doxytag: member="util.h::stp_strdup" ref="g2f861f4a98ad496ca8cd995147867f32" args="(const char *s)" --><p>
+<a class="anchor" name="ga30"></a><!-- doxytag: member="util.h::stp_strdup" ref="ga30" args="(const char *s)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1652,7 +1643,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<a class="anchor" name="g054943d301baecba82cdb78b7e454880"></a><!-- doxytag: member="util.h::stp_strlen" ref="g054943d301baecba82cdb78b7e454880" args="(const char *s)" --><p>
+<a class="anchor" name="ga28"></a><!-- doxytag: member="util.h::stp_strlen" ref="ga28" args="(const char *s)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1680,7 +1671,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<a class="anchor" name="g2c6b28a35780bfa7d03a2f8381ee82c2"></a><!-- doxytag: member="util.h::stp_strndup" ref="g2c6b28a35780bfa7d03a2f8381ee82c2" args="(const char *s, int n)" --><p>
+<a class="anchor" name="ga29"></a><!-- doxytag: member="util.h::stp_strndup" ref="ga29" args="(const char *s, int n)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1717,7 +1708,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<a class="anchor" name="gae1d98650ef9777ae4f4b10eae60b5c9"></a><!-- doxytag: member="util.h::stp_zalloc" ref="gae1d98650ef9777ae4f4b10eae60b5c9" args="(size_t)" --><p>
+<a class="anchor" name="ga25"></a><!-- doxytag: member="util.h::stp_zalloc" ref="ga25" args="(size_t)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1745,7 +1736,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1771,7 +1762,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1794,7 +1785,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1802,7 +1793,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1837,8 +1828,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html
index 8e9b48d..a01bec1 100644
--- a/doc/gutenprint/html/group__vars.html
+++ b/doc/gutenprint/html/group__vars.html
@@ -2,18 +2,9 @@
 <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.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>
+<!-- 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>
 <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>
@@ -31,457 +22,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#gde33aeed00b53e4af71ee1f7c4326279">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#ga0">stp_vars_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 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 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 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 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">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">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="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="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 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 stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9ee295029ad2d072b4099dc390359900">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#ga6">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#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>, 
+<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>, 
 <br>
-&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>, 
+&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>, 
 <br>
-&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>
+&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>
 <br>
  }</td></tr>
 
-<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>
+<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>
  }</td></tr>
 
-<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>, 
+<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>, 
 <br>
-&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>, 
+&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>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3">STP_PARAMETER_LEVEL_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a29">STP_PARAMETER_LEVEL_INVALID</a>
 <br>
  }</td></tr>
 
-<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>
+<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>
  }</td></tr>
 
-<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>
+<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>
  }</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#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="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="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">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">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 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 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">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">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">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">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="#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="#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">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">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">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">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="#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="#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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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 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 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">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">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 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 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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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="#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="#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 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 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="#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="#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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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">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">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="#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="#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 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 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="#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="#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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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 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 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 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 (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) 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) 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) 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) 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 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 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 (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 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 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 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 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 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">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">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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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">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">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">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">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="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="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#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#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">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"><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"><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">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">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">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#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#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#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#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>
+<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>
 
 </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="g9ee295029ad2d072b4099dc390359900"></a><!-- doxytag: member="vars.h::compdata_t" ref="g9ee295029ad2d072b4099dc390359900" 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="ga6"></a><!-- doxytag: member="vars.h::compdata_t" 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">typedef struct stp_compdata <a class="el" href="group__vars.html#g9ee295029ad2d072b4099dc390359900">compdata_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_compdata <a class="el" href="group__vars.html#ga6">compdata_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -498,13 +489,13 @@ The representation of printer settings has changed dramatically from 4.2. All (w
     </td>
   </tr>
 </table>
-<a class="anchor" name="g73ac4d52cb5cecbb9694e9038fb7ea82"></a><!-- doxytag: member="vars.h::stp_const_parameter_list_t" ref="g73ac4d52cb5cecbb9694e9038fb7ea82" args="" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="vars.h::stp_const_parameter_list_t" ref="ga2" 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#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef const void* <a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -523,13 +514,13 @@ The constant parameter_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gd31fc080a2bd980c6a05a541dc1612a3"></a><!-- doxytag: member="vars.h::stp_copy_data_func_t" ref="gd31fc080a2bd980c6a05a541dc1612a3" args=")(void *)" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="vars.h::stp_copy_data_func_t" ref="ga4" 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#gd31fc080a2bd980c6a05a541dc1612a3">stp_copy_data_func_t</a>)(void *)          </td>
+          <td class="md" nowrap valign="top">typedef void*(* <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a>)(void *)          </td>
         </tr>
       </table>
     </td>
@@ -546,13 +537,13 @@ The constant parameter_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g3f7233002f4db790a077e33c2661665c"></a><!-- doxytag: member="vars.h::stp_free_data_func_t" ref="g3f7233002f4db790a077e33c2661665c" args=")(void *)" --><p>
+<a class="anchor" name="ga5"></a><!-- doxytag: member="vars.h::stp_free_data_func_t" ref="ga5" 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#g3f7233002f4db790a077e33c2661665c">stp_free_data_func_t</a>)(void *)          </td>
+          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a>)(void *)          </td>
         </tr>
       </table>
     </td>
@@ -569,13 +560,13 @@ The constant parameter_list opaque data type.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#gd11be815334025415a8e2023e0cd44c5">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#ga3">stp_outfunc_t</a>)(void *data, const char *buffer, size_t bytes)          </td>
         </tr>
       </table>
     </td>
@@ -595,19 +586,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="gb264246d4b7e584447b5f39ed8f7ee05"></a><!-- doxytag: member="vars.h::stp_parameter_list_t" ref="gb264246d4b7e584447b5f39ed8f7ee05" args="" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="vars.h::stp_parameter_list_t" ref="ga1" 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#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef void* <a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -626,13 +617,13 @@ The parameter_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gde33aeed00b53e4af71ee1f7c4326279"></a><!-- doxytag: member="vars.h::stp_vars_t" ref="gde33aeed00b53e4af71ee1f7c4326279" args="" --><p>
+<a class="anchor" name="ga0"></a><!-- doxytag: member="vars.h::stp_vars_t" ref="ga0" 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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_vars <a class="el" href="group__vars.html#ga0">stp_vars_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -652,13 +643,13 @@ The vars opaque data type.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="gb11c7af74fa0595684377cafe4d4eb53"></a><!-- doxytag: member="vars.h::stp_parameter_activity_t" ref="gb11c7af74fa0595684377cafe4d4eb53" args="" --><p>
+<a class="anchor" name="ga135"></a><!-- doxytag: member="vars.h::stp_parameter_activity_t" ref="ga135" 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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -674,26 +665,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="ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab"></a><!-- doxytag: member="STP_PARAMETER_INACTIVE" ref="ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab" args="" -->STP_PARAMETER_INACTIVE</em>&nbsp;</td><td>
+<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>
 Parameter is inactive (unused). </td></tr>
-<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>
+<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>
 Parameter is set to its default value. </td></tr>
-<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>
+<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>
 Parameter is active (used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="g13c0565b3039fa25fd77092a578d44e9"></a><!-- doxytag: member="vars.h::stp_parameter_class_t" ref="g13c0565b3039fa25fd77092a578d44e9" args="" --><p>
+<a class="anchor" name="ga133"></a><!-- doxytag: member="vars.h::stp_parameter_class_t" ref="ga133" 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#g13c0565b3039fa25fd77092a578d44e9">stp_parameter_class_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -709,28 +700,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="gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11"></a><!-- doxytag: member="STP_PARAMETER_CLASS_FEATURE" ref="gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11" args="" -->STP_PARAMETER_CLASS_FEATURE</em>&nbsp;</td><td>
+<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>
 Printer feature. </td></tr>
-<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>
+<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>
 Output control. </td></tr>
-<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>
+<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>
 Core Gimp-Print parameter. </td></tr>
-<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>
+<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>
 Invalid class (should never be used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="gaa13470b0a857e96dbe70882b3fb8ebe"></a><!-- doxytag: member="vars.h::stp_parameter_level_t" ref="gaa13470b0a857e96dbe70882b3fb8ebe" args="" --><p>
+<a class="anchor" name="ga134"></a><!-- doxytag: member="vars.h::stp_parameter_level_t" ref="ga134" 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#gaa13470b0a857e96dbe70882b3fb8ebe">stp_parameter_level_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -746,38 +737,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="ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_BASIC" ref="ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca" args="" -->STP_PARAMETER_LEVEL_BASIC</em>&nbsp;</td><td>
+<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>
 Basic parameter, shown by all UIs. </td></tr>
-<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>
+<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>
 Advanced parameter, shown by advanced UIs. </td></tr>
-<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>
+<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>
 Advanced1 parameter, shown by advanced UIs. </td></tr>
-<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>
+<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>
 Advanced2 parameter, shown by advanced UIs. </td></tr>
-<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>
+<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>
 Advanced3 parameter, shown by advanced UIs. </td></tr>
-<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>
+<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>
 Advanced4 parameter, shown by advanced UIs. </td></tr>
-<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>
+<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>
 Parameters used only within Gimp-Print. </td></tr>
-<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>
+<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>
 Parameters used only outside Gimp-Print. </td></tr>
-<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>
+<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>
 Invalid level (should never be used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ge031ab2c7ff60007e284ed71a73111e5"></a><!-- doxytag: member="vars.h::stp_parameter_type_t" ref="ge031ab2c7ff60007e284ed71a73111e5" args="" --><p>
+<a class="anchor" name="ga132"></a><!-- doxytag: member="vars.h::stp_parameter_type_t" ref="ga132" 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#ge031ab2c7ff60007e284ed71a73111e5">stp_parameter_type_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga132">stp_parameter_type_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -793,40 +784,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="gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2"></a><!-- doxytag: member="STP_PARAMETER_TYPE_STRING_LIST" ref="gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2" args="" -->STP_PARAMETER_TYPE_STRING_LIST</em>&nbsp;</td><td>
+<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>
 Single string choice from a list. </td></tr>
-<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>
+<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>
 Integer. </td></tr>
-<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>
+<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>
 Boolean. </td></tr>
-<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>
+<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>
 Floating point number. </td></tr>
-<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>
+<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>
 Curve. </td></tr>
-<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>
+<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>
 Filename (NYI, need to consider security). </td></tr>
-<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>
+<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>
 Raw, opaque data. </td></tr>
-<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>
+<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>
 Array. </td></tr>
-<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>
+<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>
 Linear dimension. </td></tr>
-<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>
+<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>
 Invalid type (should never be used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="g1d02c21b8f025b121dd340db9adf3516"></a><!-- doxytag: member="vars.h::stp_parameter_verify_t" ref="g1d02c21b8f025b121dd340db9adf3516" args="" --><p>
+<a class="anchor" name="ga136"></a><!-- doxytag: member="vars.h::stp_parameter_verify_t" ref="ga136" 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#g1d02c21b8f025b121dd340db9adf3516">stp_parameter_verify_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -842,11 +833,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="gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25"></a><!-- doxytag: member="PARAMETER_BAD" ref="gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25" args="" -->PARAMETER_BAD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga136a33"></a><!-- doxytag: member="PARAMETER_BAD" ref="gga136a33" args="" -->PARAMETER_BAD</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333"></a><!-- doxytag: member="PARAMETER_OK" ref="gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333" args="" -->PARAMETER_OK</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga136a34"></a><!-- doxytag: member="PARAMETER_OK" ref="gga136a34" args="" -->PARAMETER_OK</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9"></a><!-- doxytag: member="PARAMETER_INACTIVE" ref="gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9" args="" -->PARAMETER_INACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gga136a35"></a><!-- doxytag: member="PARAMETER_INACTIVE" ref="gga136a35" args="" -->PARAMETER_INACTIVE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
@@ -854,7 +845,7 @@ Invalid type (should never be used). </td></tr>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -862,7 +853,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -874,13 +865,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#gd31fc080a2bd980c6a05a541dc1612a3">stp_copy_data_func_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga4">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#g3f7233002f4db790a077e33c2661665c">stp_free_data_func_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>freefunc</em>, </td>
         </tr>
         <tr>
@@ -909,7 +900,7 @@ Invalid type (should never be used). </td></tr>
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -917,7 +908,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -929,7 +920,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -955,13 +946,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -969,7 +960,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -981,7 +972,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1007,13 +998,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1021,7 +1012,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1033,7 +1024,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1059,13 +1050,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1073,7 +1064,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1085,7 +1076,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1111,13 +1102,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1125,7 +1116,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1137,7 +1128,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1163,13 +1154,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1177,7 +1168,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1189,7 +1180,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1215,13 +1206,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1229,7 +1220,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1241,7 +1232,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1267,13 +1258,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1281,7 +1272,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1293,7 +1284,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1319,13 +1310,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1333,7 +1324,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1345,7 +1336,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1371,13 +1362,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="gb9df68cbf9973203adfca5e1293b300a"></a><!-- doxytag: member="vars.h::stp_clear_array_parameter" ref="gb9df68cbf9973203adfca5e1293b300a" args="(stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1385,7 +1376,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1416,13 +1407,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="ge5b7e3356b3c1c893620fdeeea486e48"></a><!-- doxytag: member="vars.h::stp_clear_boolean_parameter" ref="ge5b7e3356b3c1c893620fdeeea486e48" args="(stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1430,7 +1421,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1461,13 +1452,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="g9e992f880bd74cd4097527a39aea7125"></a><!-- doxytag: member="vars.h::stp_clear_curve_parameter" ref="g9e992f880bd74cd4097527a39aea7125" args="(stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1475,7 +1466,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1506,13 +1497,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="g28203d9250f232f9af290802cf2db881"></a><!-- doxytag: member="vars.h::stp_clear_dimension_parameter" ref="g28203d9250f232f9af290802cf2db881" args="(stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1520,7 +1511,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1551,13 +1542,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="g7acde85eb361525f5cf481bafddbc1bd"></a><!-- doxytag: member="vars.h::stp_clear_file_parameter" ref="g7acde85eb361525f5cf481bafddbc1bd" args="(stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1565,7 +1556,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1596,13 +1587,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="g740a5cab681f30b8cc5e4ca18197e472"></a><!-- doxytag: member="vars.h::stp_clear_float_parameter" ref="g740a5cab681f30b8cc5e4ca18197e472" args="(stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1610,7 +1601,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1641,13 +1632,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="g4841e9250e4c7f38f2267355402ffcc1"></a><!-- doxytag: member="vars.h::stp_clear_int_parameter" ref="g4841e9250e4c7f38f2267355402ffcc1" args="(stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1655,7 +1646,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1686,13 +1677,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="ga79b051578077beca548be224062705c"></a><!-- doxytag: member="vars.h::stp_clear_raw_parameter" ref="ga79b051578077beca548be224062705c" args="(stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1700,7 +1691,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1731,13 +1722,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="gc7fe8cd335309d755fe5b54bf6b8e5a3"></a><!-- doxytag: member="vars.h::stp_clear_string_parameter" ref="gc7fe8cd335309d755fe5b54bf6b8e5a3" args="(stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1745,7 +1736,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1776,13 +1767,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="gbd8b19b70d2f2fc7dcd7c896b3ed5d98"></a><!-- doxytag: member="vars.h::stp_copy_options" ref="gbd8b19b70d2f2fc7dcd7c896b3ed5d98" args="(stp_vars_t *vd, const stp_vars_t *vs)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1790,13 +1781,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>vs</em></td>
         </tr>
         <tr>
@@ -1819,13 +1810,13 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
     </td>
   </tr>
 </table>
-<a class="anchor" name="g9f897908b19f5f0cdaf75b483d46e041"></a><!-- doxytag: member="vars.h::stp_default_settings" ref="g9f897908b19f5f0cdaf75b483d46e041" args="(void)" --><p>
+<a class="anchor" name="ga123"></a><!-- doxytag: member="vars.h::stp_default_settings" ref="ga123" 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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a>* stp_default_settings           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -1846,11 +1837,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1858,7 +1849,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1896,13 +1887,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="g5735451225c2a355cb11c165e011637d"></a><!-- doxytag: member="vars.h::stp_describe_resolution" ref="g5735451225c2a355cb11c165e011637d" args="(const stp_vars_t *v, int *x, int *y)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1910,7 +1901,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1948,13 +1939,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="g089f9a34f26f700f43858ba3959d8f13"></a><!-- doxytag: member="vars.h::stp_destroy_component_data" ref="g089f9a34f26f700f43858ba3959d8f13" args="(stp_vars_t *v, const char *name)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1962,7 +1953,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1991,7 +1982,7 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2028,15 +2019,15 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* stp_get_array_parameter           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2070,19 +2061,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="g64e5f74483ffb7bd4412f4eefeb22250"></a><!-- doxytag: member="vars.h::stp_get_array_parameter_active" ref="g64e5f74483ffb7bd4412f4eefeb22250" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table 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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_array_parameter_active           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2116,11 +2107,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="g4cc8b69619067f882035cca46e9ce0cd"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter" ref="g4cc8b69619067f882035cca46e9ce0cd" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2128,7 +2119,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2162,19 +2153,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="g361d0ba27ad2ec9e99e5eec05f2e76a6"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter_active" ref="g361d0ba27ad2ec9e99e5eec05f2e76a6" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table 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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_boolean_parameter_active           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2208,11 +2199,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="g087136342c500c138d73dbe0e2aad11a"></a><!-- doxytag: member="vars.h::stp_get_color_conversion" ref="g087136342c500c138d73dbe0e2aad11a" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga16"></a><!-- doxytag: member="vars.h::stp_get_color_conversion" ref="ga16" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2220,7 +2211,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2239,11 +2230,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="g8eea0724106ea7174b808026ae8d1a5c"></a><!-- doxytag: member="vars.h::stp_get_component_data" ref="g8eea0724106ea7174b808026ae8d1a5c" args="(const stp_vars_t *v, const char *name)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2251,7 +2242,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2280,15 +2271,15 @@ Get the name of the color conversion routine.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_get_curve_parameter           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2322,19 +2313,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="gb686075ecbdf349387c356826b432191"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter_active" ref="gb686075ecbdf349387c356826b432191" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table 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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_curve_parameter_active           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2368,11 +2359,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="gb4121cba599314c929d04cce0e850473"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter" ref="gb4121cba599314c929d04cce0e850473" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2380,7 +2371,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2414,19 +2405,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="g8125d08f90002e654f2e45427e2f0251"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter_active" ref="g8125d08f90002e654f2e45427e2f0251" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table 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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_dimension_parameter_active           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2460,11 +2451,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="gcf8efdb6fd9847e41c85f9491a252f01"></a><!-- doxytag: member="vars.h::stp_get_driver" ref="gcf8efdb6fd9847e41c85f9491a252f01" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga13"></a><!-- doxytag: member="vars.h::stp_get_driver" ref="ga13" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2472,7 +2463,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2491,11 +2482,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="ge66b9c64f5821ee6e95f4b9e18cadd4e"></a><!-- doxytag: member="vars.h::stp_get_errdata" ref="ge66b9c64f5821ee6e95f4b9e18cadd4e" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga36"></a><!-- doxytag: member="vars.h::stp_get_errdata" ref="ga36" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2503,7 +2494,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2527,19 +2518,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="g9fe5b4efdfaa3e79918dd5079e61e2c5"></a><!-- doxytag: member="vars.h::stp_get_errfunc" ref="g9fe5b4efdfaa3e79918dd5079e61e2c5" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga32"></a><!-- doxytag: member="vars.h::stp_get_errfunc" ref="ga32" 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#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a> stp_get_errfunc           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">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>
@@ -2563,11 +2554,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="g5efb45e6883a2522fd7e78c6eb761c79"></a><!-- doxytag: member="vars.h::stp_get_file_parameter" ref="g5efb45e6883a2522fd7e78c6eb761c79" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2575,7 +2566,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2609,19 +2600,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="g0f09e85b570ffee4a4d94853bb22bcb3"></a><!-- doxytag: member="vars.h::stp_get_file_parameter_active" ref="g0f09e85b570ffee4a4d94853bb22bcb3" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table 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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_file_parameter_active           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2655,11 +2646,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="g46195f69cc57bd18a4cde5756dd84601"></a><!-- doxytag: member="vars.h::stp_get_float_parameter" ref="g46195f69cc57bd18a4cde5756dd84601" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2667,7 +2658,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2701,19 +2692,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="g28d01beda4b54cec395654847dbbc301"></a><!-- doxytag: member="vars.h::stp_get_float_parameter_active" ref="g28d01beda4b54cec395654847dbbc301" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table 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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_float_parameter_active           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2747,11 +2738,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="g7623276e130cb684670ecb153300ebaf"></a><!-- doxytag: member="vars.h::stp_get_height" ref="g7623276e130cb684670ecb153300ebaf" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga24"></a><!-- doxytag: member="vars.h::stp_get_height" ref="ga24" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2759,7 +2750,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2778,11 +2769,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2790,7 +2781,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2845,13 +2836,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="g22bc2b8307fb6a95dac7fcf3d35bf6b9"></a><!-- doxytag: member="vars.h::stp_get_int_parameter" ref="g22bc2b8307fb6a95dac7fcf3d35bf6b9" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2859,7 +2850,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2893,19 +2884,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="gac76d8e06c3ce3fb0f27c0c80d6ad5fc"></a><!-- doxytag: member="vars.h::stp_get_int_parameter_active" ref="gac76d8e06c3ce3fb0f27c0c80d6ad5fc" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table 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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_int_parameter_active           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2939,11 +2930,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="gd3fbd778898c2b0fba19d0937fb939f5"></a><!-- doxytag: member="vars.h::stp_get_left" ref="gd3fbd778898c2b0fba19d0937fb939f5" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga18"></a><!-- doxytag: member="vars.h::stp_get_left" ref="ga18" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2951,7 +2942,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2970,11 +2961,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="ge690d9171bcdb0fedf981804bb923fac"></a><!-- doxytag: member="vars.h::stp_get_media_size" ref="ge690d9171bcdb0fedf981804bb923fac" args="(const stp_vars_t *v, int *width, int *height)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2982,7 +2973,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3020,13 +3011,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="g54e35f94578f346c07718587f18b049c"></a><!-- doxytag: member="vars.h::stp_get_outdata" ref="g54e35f94578f346c07718587f18b049c" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga34"></a><!-- doxytag: member="vars.h::stp_get_outdata" ref="ga34" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3034,7 +3025,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3058,19 +3049,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="g095834813ebbe8985d443e1fa78a0b98"></a><!-- doxytag: member="vars.h::stp_get_outfunc" ref="g095834813ebbe8985d443e1fa78a0b98" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga30"></a><!-- doxytag: member="vars.h::stp_get_outfunc" ref="ga30" 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#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a> stp_get_outfunc           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">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>
@@ -3094,11 +3085,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="g94d8cf912e3b036f67bc2d4c37d733ff"></a><!-- doxytag: member="vars.h::stp_get_page_height" ref="g94d8cf912e3b036f67bc2d4c37d733ff" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga28"></a><!-- doxytag: member="vars.h::stp_get_page_height" ref="ga28" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3106,7 +3097,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3125,11 +3116,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="gea14f3cad139fc5b8d547a252deacff3"></a><!-- doxytag: member="vars.h::stp_get_page_width" ref="gea14f3cad139fc5b8d547a252deacff3" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga26"></a><!-- doxytag: member="vars.h::stp_get_page_width" ref="ga26" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3137,7 +3128,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3156,19 +3147,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="g955b215a88b868cfc74d7a340de9b8f6"></a><!-- doxytag: member="vars.h::stp_get_parameter_list" ref="g955b215a88b868cfc74d7a340de9b8f6" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga38"></a><!-- doxytag: member="vars.h::stp_get_parameter_list" ref="ga38" 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> stp_get_parameter_list           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">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>
@@ -3192,11 +3183,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#gd0f6c2b153638f551d7709780eb7276a">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#ga42">stp_parameter_list_destroy()</a>).</dd></dl>
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3204,7 +3195,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3238,19 +3229,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="g57abcfb2fa58e743f9d30f579481845a"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter_active" ref="g57abcfb2fa58e743f9d30f579481845a" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table 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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_raw_parameter_active           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3284,11 +3275,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3296,7 +3287,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3348,13 +3339,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="ga59b141facb320c409d9071f469fdbc5"></a><!-- doxytag: member="vars.h::stp_get_string_parameter" ref="ga59b141facb320c409d9071f469fdbc5" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3362,7 +3353,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3396,19 +3387,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="gda8dd20ab17a9b403c68b4cd86fb529c"></a><!-- doxytag: member="vars.h::stp_get_string_parameter_active" ref="gda8dd20ab17a9b403c68b4cd86fb529c" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<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>
 <table 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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_string_parameter_active           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3442,11 +3433,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="gcda38fc8e26a75c2b5d246b4341a8fd3"></a><!-- doxytag: member="vars.h::stp_get_top" ref="gcda38fc8e26a75c2b5d246b4341a8fd3" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga20"></a><!-- doxytag: member="vars.h::stp_get_top" ref="ga20" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3454,7 +3445,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3473,11 +3464,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="ga1b826f02f84aa038c6862575770b629"></a><!-- doxytag: member="vars.h::stp_get_verified" ref="ga1b826f02f84aa038c6862575770b629" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga128"></a><!-- doxytag: member="vars.h::stp_get_verified" ref="ga128" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3485,7 +3476,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3505,7 +3496,7 @@ Get the top edge of the image.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1"></a><!-- doxytag: member="vars.h::stp_get_width" ref="g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga22"></a><!-- doxytag: member="vars.h::stp_get_width" ref="ga22" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3513,7 +3504,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3532,11 +3523,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="gc970fc314c6418d9193d93c787b908d9"></a><!-- doxytag: member="vars.h::stp_merge_printvars" ref="gc970fc314c6418d9193d93c787b908d9" args="(stp_vars_t *user, const stp_vars_t *print)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3544,13 +3535,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>print</em></td>
         </tr>
         <tr>
@@ -3572,17 +3563,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. <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.</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>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="gc5a3eb0348d31acf60772265c3896542"></a><!-- doxytag: member="vars.h::stp_parameter_description_destroy" ref="gc5a3eb0348d31acf60772265c3896542" args="(stp_parameter_t *description)" --><p>
+<a class="anchor" name="ga48"></a><!-- doxytag: member="vars.h::stp_parameter_description_destroy" ref="ga48" args="(stp_parameter_t *description)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3611,13 +3602,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="g3dea1f995d40482b9f6470fedd994f95"></a><!-- doxytag: member="vars.h::stp_parameter_find" ref="g3dea1f995d40482b9f6470fedd994f95" args="(stp_const_parameter_list_t list, const char *name)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3625,7 +3616,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#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -3659,11 +3650,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="g711cf3e5e52fd3434ef7a9d16654aea8"></a><!-- doxytag: member="vars.h::stp_parameter_find_in_settings" ref="g711cf3e5e52fd3434ef7a9d16654aea8" args="(const stp_vars_t *v, const char *name)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3671,7 +3662,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3705,11 +3696,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3717,7 +3708,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#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -3748,13 +3739,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3762,13 +3753,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#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&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="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#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>append</em></td>
         </tr>
         <tr>
@@ -3793,21 +3784,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="g62c6225b0721d5c80d889edc307f0b6b"></a><!-- doxytag: member="vars.h::stp_parameter_list_copy" ref="g62c6225b0721d5c80d889edc307f0b6b" args="(stp_const_parameter_list_t list)" --><p>
+<a class="anchor" name="ga45"></a><!-- doxytag: member="vars.h::stp_parameter_list_copy" ref="ga45" 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#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> stp_parameter_list_copy           </td>
+          <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" valign="top">(&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="md" nowrap valign="top"><a class="el" href="group__vars.html#ga2">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>
@@ -3831,11 +3822,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="gf69f651a798e9f06c67baf06f0754228"></a><!-- doxytag: member="vars.h::stp_parameter_list_count" ref="gf69f651a798e9f06c67baf06f0754228" args="(stp_const_parameter_list_t list)" --><p>
+<a class="anchor" name="ga39"></a><!-- doxytag: member="vars.h::stp_parameter_list_count" ref="ga39" args="(stp_const_parameter_list_t list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3843,7 +3834,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#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>&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="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3867,17 +3858,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="g3c1ddd3c10c367c0912fdd841576278f"></a><!-- doxytag: member="vars.h::stp_parameter_list_create" ref="g3c1ddd3c10c367c0912fdd841576278f" args="(void)" --><p>
+<a class="anchor" name="ga43"></a><!-- doxytag: member="vars.h::stp_parameter_list_create" ref="ga43" 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#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> stp_parameter_list_create           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -3898,11 +3889,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="gd0f6c2b153638f551d7709780eb7276a"></a><!-- doxytag: member="vars.h::stp_parameter_list_destroy" ref="gd0f6c2b153638f551d7709780eb7276a" args="(stp_parameter_list_t list)" --><p>
+<a class="anchor" name="ga42"></a><!-- doxytag: member="vars.h::stp_parameter_list_destroy" ref="ga42" args="(stp_parameter_list_t list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3910,7 +3901,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#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&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="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3931,13 +3922,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="g96fc73864dfc00ae418f14a81c72be26"></a><!-- doxytag: member="vars.h::stp_parameter_list_param" ref="g96fc73864dfc00ae418f14a81c72be26" args="(stp_const_parameter_list_t list, size_t item)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3945,7 +3936,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#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -3979,11 +3970,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="gec605c647cab13d61ab5e2822d9f7ead"></a><!-- doxytag: member="vars.h::stp_scale_float_parameter" ref="gec605c647cab13d61ab5e2822d9f7ead" args="(stp_vars_t *v, const char *parameter, double scale)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3991,7 +3982,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4029,13 +4020,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4043,7 +4034,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4055,7 +4046,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>value</em></td>
         </tr>
         <tr>
@@ -4081,13 +4072,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4095,7 +4086,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4107,7 +4098,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -4133,13 +4124,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="g8f67ed7dcee969e77374fb4daf468d58"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter" ref="g8f67ed7dcee969e77374fb4daf468d58" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4147,7 +4138,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4185,13 +4176,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4199,7 +4190,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4211,7 +4202,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -4237,13 +4228,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="g335e7eb264fa22343765146fb2318b31"></a><!-- doxytag: member="vars.h::stp_set_color_conversion" ref="g335e7eb264fa22343765146fb2318b31" args="(stp_vars_t *v, const char *val)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4251,7 +4242,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4282,13 +4273,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="g3164aa99994dabb561d6c295eb647123"></a><!-- doxytag: member="vars.h::stp_set_color_conversion_n" ref="g3164aa99994dabb561d6c295eb647123" args="(stp_vars_t *v, const char *val, int bytes)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4296,7 +4287,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4334,13 +4325,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4348,7 +4339,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4360,7 +4351,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>value</em></td>
         </tr>
         <tr>
@@ -4386,13 +4377,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4400,7 +4391,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4412,7 +4403,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -4438,13 +4429,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4452,7 +4443,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4464,7 +4455,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>value</em></td>
         </tr>
         <tr>
@@ -4490,13 +4481,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="gd286782f691998858e30a202506bad74"></a><!-- doxytag: member="vars.h::stp_set_default_boolean_parameter" ref="gd286782f691998858e30a202506bad74" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4504,7 +4495,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4542,13 +4533,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4556,7 +4547,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4568,7 +4559,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>value</em></td>
         </tr>
         <tr>
@@ -4594,13 +4585,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="g18b8a4fb414245d2c30df9ee11057845"></a><!-- doxytag: member="vars.h::stp_set_default_dimension_parameter" ref="g18b8a4fb414245d2c30df9ee11057845" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4608,7 +4599,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4646,13 +4637,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4660,7 +4651,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4698,13 +4689,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4712,7 +4703,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4757,13 +4748,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="g59b79c779211a72de534fb9e61548f97"></a><!-- doxytag: member="vars.h::stp_set_default_float_parameter" ref="g59b79c779211a72de534fb9e61548f97" args="(stp_vars_t *v, const char *parameter, double value)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4771,7 +4762,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4809,13 +4800,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="gbf1d9c938d364598414e9f15c41c1f08"></a><!-- doxytag: member="vars.h::stp_set_default_int_parameter" ref="gbf1d9c938d364598414e9f15c41c1f08" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4823,7 +4814,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4861,13 +4852,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4875,7 +4866,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4920,13 +4911,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4934,7 +4925,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4972,13 +4963,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4986,7 +4977,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5031,13 +5022,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="g778b0e43aad1e011012b8071b469c694"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter" ref="g778b0e43aad1e011012b8071b469c694" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5045,7 +5036,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5083,13 +5074,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5097,7 +5088,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5109,7 +5100,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5135,13 +5126,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="ga8d9dbb1e613cfe2b119668158e35a76"></a><!-- doxytag: member="vars.h::stp_set_driver" ref="ga8d9dbb1e613cfe2b119668158e35a76" args="(stp_vars_t *v, const char *val)" --><p>
+<a class="anchor" name="ga11"></a><!-- doxytag: member="vars.h::stp_set_driver" ref="ga11" args="(stp_vars_t *v, const char *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5149,7 +5140,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5180,13 +5171,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="ge303a6ed77135b691ebbfd56cb577531"></a><!-- doxytag: member="vars.h::stp_set_driver_n" ref="ge303a6ed77135b691ebbfd56cb577531" args="(stp_vars_t *v, const char *val, int bytes)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5194,7 +5185,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5232,13 +5223,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="g7a006418c4dbb265be71f7b5a202455d"></a><!-- doxytag: member="vars.h::stp_set_errdata" ref="g7a006418c4dbb265be71f7b5a202455d" args="(stp_vars_t *v, void *val)" --><p>
+<a class="anchor" name="ga35"></a><!-- doxytag: member="vars.h::stp_set_errdata" ref="ga35" args="(stp_vars_t *v, void *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5246,7 +5237,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5277,13 +5268,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="ge89d8eb48e4a7a8107b87a44a4318064"></a><!-- doxytag: member="vars.h::stp_set_errfunc" ref="ge89d8eb48e4a7a8107b87a44a4318064" args="(stp_vars_t *v, stp_outfunc_t val)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5291,13 +5282,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>val</em></td>
         </tr>
         <tr>
@@ -5322,13 +5313,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="g8134e4dc36b063a7d7dd229b9df32726"></a><!-- doxytag: member="vars.h::stp_set_file_parameter" ref="g8134e4dc36b063a7d7dd229b9df32726" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5336,7 +5327,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5374,13 +5365,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5388,7 +5379,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5400,7 +5391,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5426,13 +5417,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5440,7 +5431,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5485,13 +5476,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="g82f7bbcf639c60678c1dc2aee24e8a24"></a><!-- doxytag: member="vars.h::stp_set_float_parameter" ref="g82f7bbcf639c60678c1dc2aee24e8a24" args="(stp_vars_t *v, const char *parameter, double value)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5499,7 +5490,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5537,13 +5528,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5551,7 +5542,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5563,7 +5554,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5589,13 +5580,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="g68110f6d19b3987f6f66baee3926eb89"></a><!-- doxytag: member="vars.h::stp_set_height" ref="g68110f6d19b3987f6f66baee3926eb89" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="ga23"></a><!-- doxytag: member="vars.h::stp_set_height" ref="ga23" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5603,7 +5594,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5634,13 +5625,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="g8c6cd5f3bb3ab59a4f06c020c062c13e"></a><!-- doxytag: member="vars.h::stp_set_int_parameter" ref="g8c6cd5f3bb3ab59a4f06c020c062c13e" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5648,7 +5639,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5686,13 +5677,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5700,7 +5691,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5712,7 +5703,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5738,13 +5729,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="g5d675ab9877df60ec467a20a0d62fcbc"></a><!-- doxytag: member="vars.h::stp_set_left" ref="g5d675ab9877df60ec467a20a0d62fcbc" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="ga17"></a><!-- doxytag: member="vars.h::stp_set_left" ref="ga17" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5752,7 +5743,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5783,13 +5774,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="g8fef23ae01a368f4d16ad95813d97d6d"></a><!-- doxytag: member="vars.h::stp_set_outdata" ref="g8fef23ae01a368f4d16ad95813d97d6d" args="(stp_vars_t *v, void *val)" --><p>
+<a class="anchor" name="ga33"></a><!-- doxytag: member="vars.h::stp_set_outdata" ref="ga33" args="(stp_vars_t *v, void *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5797,7 +5788,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5828,13 +5819,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="g30d5438686c8ead9a092f98bf3c3d8ca"></a><!-- doxytag: member="vars.h::stp_set_outfunc" ref="g30d5438686c8ead9a092f98bf3c3d8ca" args="(stp_vars_t *v, stp_outfunc_t val)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5842,13 +5833,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>val</em></td>
         </tr>
         <tr>
@@ -5873,13 +5864,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="g775714bf75f1fdbdd895f59edc9eca55"></a><!-- doxytag: member="vars.h::stp_set_page_height" ref="g775714bf75f1fdbdd895f59edc9eca55" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="ga27"></a><!-- doxytag: member="vars.h::stp_set_page_height" ref="ga27" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5887,7 +5878,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5918,13 +5909,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="g751759cdeb8feb061c00f35d37fea45c"></a><!-- doxytag: member="vars.h::stp_set_page_width" ref="g751759cdeb8feb061c00f35d37fea45c" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="ga25"></a><!-- doxytag: member="vars.h::stp_set_page_width" ref="ga25" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5932,7 +5923,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5963,13 +5954,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5977,7 +5968,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6022,13 +6013,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6036,7 +6027,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6048,7 +6039,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -6074,13 +6065,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="g22338d64a871a8b279fdee6fd83fff7f"></a><!-- doxytag: member="vars.h::stp_set_string_parameter" ref="g22338d64a871a8b279fdee6fd83fff7f" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6088,7 +6079,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6126,13 +6117,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6140,7 +6131,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6152,7 +6143,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#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -6178,13 +6169,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6192,7 +6183,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6237,13 +6228,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="gaa76e04fcde3aa6c162fb9d2fcaca251"></a><!-- doxytag: member="vars.h::stp_set_top" ref="gaa76e04fcde3aa6c162fb9d2fcaca251" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="ga19"></a><!-- doxytag: member="vars.h::stp_set_top" ref="ga19" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6251,7 +6242,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6282,13 +6273,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="g8a2924dd6393431e994d22c704ec25fc"></a><!-- doxytag: member="vars.h::stp_set_verified" ref="g8a2924dd6393431e994d22c704ec25fc" args="(stp_vars_t *v, int value)" --><p>
+<a class="anchor" name="ga129"></a><!-- doxytag: member="vars.h::stp_set_verified" ref="ga129" args="(stp_vars_t *v, int value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6296,7 +6287,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6325,7 +6316,7 @@ Set the top edge of the image.
     </td>
   </tr>
 </table>
-<a class="anchor" name="gdbdd8bad1742e87b5c5a299c2ebf7cf4"></a><!-- doxytag: member="vars.h::stp_set_width" ref="gdbdd8bad1742e87b5c5a299c2ebf7cf4" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="ga21"></a><!-- doxytag: member="vars.h::stp_set_width" ref="ga21" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6333,7 +6324,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6364,13 +6355,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="g165ae58fed1515b5466ab1b84df85a86"></a><!-- doxytag: member="vars.h::stp_vars_copy" ref="g165ae58fed1515b5466ab1b84df85a86" args="(stp_vars_t *dest, const stp_vars_t *source)" --><p>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6378,13 +6369,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>source</em></td>
         </tr>
         <tr>
@@ -6406,22 +6397,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#gae35d353b6f86b1cbb97bb0b271f5c9a">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#ga7">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="gae35d353b6f86b1cbb97bb0b271f5c9a"></a><!-- doxytag: member="vars.h::stp_vars_create" ref="gae35d353b6f86b1cbb97bb0b271f5c9a" args="(void)" --><p>
+<a class="anchor" name="ga7"></a><!-- doxytag: member="vars.h::stp_vars_create" ref="ga7" 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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a>* stp_vars_create           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -6442,19 +6433,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="g3c6d765cc5a27b322289e9baa9d97098"></a><!-- doxytag: member="vars.h::stp_vars_create_copy" ref="g3c6d765cc5a27b322289e9baa9d97098" args="(const stp_vars_t *source)" --><p>
+<a class="anchor" name="ga9"></a><!-- doxytag: member="vars.h::stp_vars_create_copy" ref="ga9" 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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a>* stp_vars_create_copy           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">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>
@@ -6473,16 +6464,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#gae35d353b6f86b1cbb97bb0b271f5c9a">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#ga7">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="g78259fcaa881655a07ef0b2b457bdf70"></a><!-- doxytag: member="vars.h::stp_vars_destroy" ref="g78259fcaa881655a07ef0b2b457bdf70" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="ga10"></a><!-- doxytag: member="vars.h::stp_vars_destroy" ref="ga10" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6490,7 +6481,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -6511,13 +6502,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="ge28b0d78641811b1625a52971a2d11fa"></a><!-- doxytag: member="vars.h::stp_verify" ref="ge28b0d78641811b1625a52971a2d11fa" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="ga122"></a><!-- doxytag: member="vars.h::stp_verify" ref="ga122" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6525,7 +6516,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -6549,19 +6540,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="gf64e586fca554f2dd65157a76eaad34a"></a><!-- doxytag: member="vars.h::stp_verify_parameter" ref="gf64e586fca554f2dd65157a76eaad34a" args="(const stp_vars_t *v, const char *parameter, int quiet)" --><p>
+<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>
 <table 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#g1d02c21b8f025b121dd340db9adf3516">stp_parameter_verify_t</a> stp_verify_parameter           </td>
+          <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" valign="top">(&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="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6596,8 +6587,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html
index e63d74e..99cd7cd 100644
--- a/doc/gutenprint/html/group__version.html
+++ b/doc/gutenprint/html/group__version.html
@@ -2,65 +2,56 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#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#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#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#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#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#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#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#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#g26c662a55c391d11663052ca39458972">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#ga13">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#g888f2f6268a658d1a6b71b5288299488">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#ga6">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="#g888f2f6268a658d1a6b71b5288299488"></a><br></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 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#g19a4efe48689fb8f859d04e60bfe028f">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#ga0">stp_major_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 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 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 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 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 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 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 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 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 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 interface age number (number of revisions of this ABI).  <a href="#gf242f39e07a0ab2f2e25e1b7bc3e3aac"></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="#ga5"></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="ge754fd2fde377ba0bbe61aee1a31dd9a"></a><!-- doxytag: member="gutenprint-version.h::STP_BINARY_AGE" ref="ge754fd2fde377ba0bbe61aee1a31dd9a" 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="ga11"></a><!-- doxytag: member="gutenprint-version.h::STP_BINARY_AGE" ref="ga11" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -83,7 +74,7 @@ Version information may be used to check the library version at compile-time, us
     </td>
   </tr>
 </table>
-<a class="anchor" name="g26c662a55c391d11663052ca39458972"></a><!-- doxytag: member="gutenprint-version.h::STP_CHECK_VERSION" ref="g26c662a55c391d11663052ca39458972" args="(major, minor, micro)" --><p>
+<a class="anchor" name="ga13"></a><!-- doxytag: member="gutenprint-version.h::STP_CHECK_VERSION" ref="ga13" args="(major, minor, micro)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -114,16 +105,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#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)))
+<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)))
 </pre></div>    </td>
   </tr>
 </table>
-<a class="anchor" name="g08cdc7e05ec4d52b2458470b6d0047fb"></a><!-- doxytag: member="gutenprint-version.h::STP_CURRENT_INTERFACE" ref="g08cdc7e05ec4d52b2458470b6d0047fb" args="" --><p>
+<a class="anchor" name="ga10"></a><!-- doxytag: member="gutenprint-version.h::STP_CURRENT_INTERFACE" ref="ga10" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -146,7 +137,7 @@ Version information may be used to check the library version at compile-time, us
     </td>
   </tr>
 </table>
-<a class="anchor" name="gfd63347e8d3a71fa8384db59deabbde5"></a><!-- doxytag: member="gutenprint-version.h::STP_INTERFACE_AGE" ref="gfd63347e8d3a71fa8384db59deabbde5" args="" --><p>
+<a class="anchor" name="ga12"></a><!-- doxytag: member="gutenprint-version.h::STP_INTERFACE_AGE" ref="ga12" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -169,7 +160,7 @@ Version information may be used to check the library version at compile-time, us
     </td>
   </tr>
 </table>
-<a class="anchor" name="g98b05dcc61492d413bb01421995f1421"></a><!-- doxytag: member="gutenprint-version.h::STP_MAJOR_VERSION" ref="g98b05dcc61492d413bb01421995f1421" args="" --><p>
+<a class="anchor" name="ga7"></a><!-- doxytag: member="gutenprint-version.h::STP_MAJOR_VERSION" ref="ga7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -192,7 +183,7 @@ Version information may be used to check the library version at compile-time, us
     </td>
   </tr>
 </table>
-<a class="anchor" name="g02b38fef35caed8b676941e8dd8aadae"></a><!-- doxytag: member="gutenprint-version.h::STP_MICRO_VERSION" ref="g02b38fef35caed8b676941e8dd8aadae" args="" --><p>
+<a class="anchor" name="ga9"></a><!-- doxytag: member="gutenprint-version.h::STP_MICRO_VERSION" ref="ga9" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -215,7 +206,7 @@ Version information may be used to check the library version at compile-time, us
     </td>
   </tr>
 </table>
-<a class="anchor" name="g26319655da45e42c3b498ae7db0bf62c"></a><!-- doxytag: member="gutenprint-version.h::STP_MINOR_VERSION" ref="g26319655da45e42c3b498ae7db0bf62c" args="" --><p>
+<a class="anchor" name="ga8"></a><!-- doxytag: member="gutenprint-version.h::STP_MINOR_VERSION" ref="ga8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -239,7 +230,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="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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -288,18 +279,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="g97878c63aacb7d1fa8eed6cf1168c2e0"></a><!-- doxytag: member="gutenprint-version.h::stp_binary_age" ref="g97878c63aacb7d1fa8eed6cf1168c2e0" args="" --><p>
+<a class="anchor" name="ga4"></a><!-- doxytag: member="gutenprint-version.h::stp_binary_age" 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 unsigned int <a class="el" href="group__version.html#g97878c63aacb7d1fa8eed6cf1168c2e0">stp_binary_age</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga4">stp_binary_age</a>          </td>
         </tr>
       </table>
     </td>
@@ -318,13 +309,13 @@ The library ABI binary age number (number of forward-compatible revisions).
     </td>
   </tr>
 </table>
-<a class="anchor" name="g78c76c5831f5046eee8a56bd010b24dc"></a><!-- doxytag: member="gutenprint-version.h::stp_current_interface" ref="g78c76c5831f5046eee8a56bd010b24dc" args="" --><p>
+<a class="anchor" name="ga3"></a><!-- doxytag: member="gutenprint-version.h::stp_current_interface" 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 unsigned int <a class="el" href="group__version.html#g78c76c5831f5046eee8a56bd010b24dc">stp_current_interface</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga3">stp_current_interface</a>          </td>
         </tr>
       </table>
     </td>
@@ -343,13 +334,13 @@ The library ABI revision number (number of incompatible revisions).
     </td>
   </tr>
 </table>
-<a class="anchor" name="gf242f39e07a0ab2f2e25e1b7bc3e3aac"></a><!-- doxytag: member="gutenprint-version.h::stp_interface_age" ref="gf242f39e07a0ab2f2e25e1b7bc3e3aac" args="" --><p>
+<a class="anchor" name="ga5"></a><!-- doxytag: member="gutenprint-version.h::stp_interface_age" ref="ga5" 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#gf242f39e07a0ab2f2e25e1b7bc3e3aac">stp_interface_age</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga5">stp_interface_age</a>          </td>
         </tr>
       </table>
     </td>
@@ -368,13 +359,13 @@ The library ABI interface age number (number of revisions of this ABI).
     </td>
   </tr>
 </table>
-<a class="anchor" name="g19a4efe48689fb8f859d04e60bfe028f"></a><!-- doxytag: member="gutenprint-version.h::stp_major_version" ref="g19a4efe48689fb8f859d04e60bfe028f" args="" --><p>
+<a class="anchor" name="ga0"></a><!-- doxytag: member="gutenprint-version.h::stp_major_version" ref="ga0" 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#g19a4efe48689fb8f859d04e60bfe028f">stp_major_version</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga0">stp_major_version</a>          </td>
         </tr>
       </table>
     </td>
@@ -393,13 +384,13 @@ The library major version number.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g24960731fb86305c31f0be5621ccb993"></a><!-- doxytag: member="gutenprint-version.h::stp_micro_version" ref="g24960731fb86305c31f0be5621ccb993" args="" --><p>
+<a class="anchor" name="ga2"></a><!-- doxytag: member="gutenprint-version.h::stp_micro_version" ref="ga2" 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#g24960731fb86305c31f0be5621ccb993">stp_micro_version</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga2">stp_micro_version</a>          </td>
         </tr>
       </table>
     </td>
@@ -418,13 +409,13 @@ The library micro version number.
     </td>
   </tr>
 </table>
-<a class="anchor" name="g66def32167cee385762282e36b60d3b7"></a><!-- doxytag: member="gutenprint-version.h::stp_minor_version" ref="g66def32167cee385762282e36b60d3b7" args="" --><p>
+<a class="anchor" name="ga1"></a><!-- doxytag: member="gutenprint-version.h::stp_minor_version" ref="ga1" 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#g66def32167cee385762282e36b60d3b7">stp_minor_version</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga1">stp_minor_version</a>          </td>
         </tr>
       </table>
     </td>
@@ -443,8 +434,8 @@ The library minor version number.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 81f3ee8..15282a1 100644
--- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
@@ -2,51 +2,37 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#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#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#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#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#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#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#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#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#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#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#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#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#g9de9caf5267f08d8164404a1f68b66f5">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#ga6">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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html
index 0a87444..5127e52 100644
--- a/doc/gutenprint/html/gutenprint-intl_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl_8h.html
@@ -2,51 +2,37 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#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#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#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#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#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#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#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#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#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#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#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#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#g9de9caf5267f08d8164404a1f68b66f5">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#ga6">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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html
index b6d6c59..c05fdc3 100644
--- a/doc/gutenprint/html/gutenprint-module_8h.html
+++ b/doc/gutenprint/html/gutenprint-module_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -36,14 +22,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#47eb7c01a3f89d34af8ea0b2c9ca32a1">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#a0">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="47eb7c01a3f89d34af8ea0b2c9ca32a1"></a><!-- doxytag: member="gutenprint-module.h::STP_MODULE" ref="47eb7c01a3f89d34af8ea0b2c9ca32a1" args="" --><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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -66,8 +52,8 @@ This header includes all of the public headers used by modules. <hr><h2>Define D
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html
index a9be052..61df7f6 100644
--- a/doc/gutenprint/html/gutenprint-version_8h.html
+++ b/doc/gutenprint/html/gutenprint-version_8h.html
@@ -2,73 +2,59 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#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#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#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#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#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#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#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#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#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#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#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#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#g26c662a55c391d11663052ca39458972">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#ga13">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#g888f2f6268a658d1a6b71b5288299488">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#ga6">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#g888f2f6268a658d1a6b71b5288299488"></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#ga6"></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#g19a4efe48689fb8f859d04e60bfe028f">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#ga0">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#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 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 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 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 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 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 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 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 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 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 interface age number (number of revisions of this ABI).  <a href="group__version.html#gf242f39e07a0ab2f2e25e1b7bc3e3aac"></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#ga5"></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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html
index 7991ae3..1e29c7c 100644
--- a/doc/gutenprint/html/gutenprint_8h.html
+++ b/doc/gutenprint/html/gutenprint_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -41,8 +27,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 Tue Nov 22 14:55:33 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 Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html
index 2f7de76..bb254e2 100644
--- a/doc/gutenprint/html/image_8h.html
+++ b/doc/gutenprint/html/image_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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">
@@ -30,39 +16,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#gf71d7111a7215d4c1f1ef1317f9d6cfc">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#ga8">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#gc5b6b70cd39959ffd06deab3724d87e9">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#ga0">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#gc5b6b70cd39959ffd06deab3724d87e9"></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#ga0"></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#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>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga9">stp_image_status_t</a> { <a class="el" href="group__image.html#gga9a2">STP_IMAGE_STATUS_OK</a>, 
+<a class="el" href="group__image.html#gga9a3">STP_IMAGE_STATUS_ABORT</a>
  }</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 class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#ga9">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#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#ga1">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#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">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga2">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#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#ga3">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#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">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga4">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#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"><a class="el" href="group__image.html#ga9">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga5">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#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">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga6">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#gd1017f2f9b91d7add73c2393d96f700a">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#ga7">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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html
index f9cae59..12b5b75 100644
--- a/doc/gutenprint/html/index.html
+++ b/doc/gutenprint/html/index.html
@@ -2,22 +2,13 @@
 <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.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>
+<!-- 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>
 <h1>libgutenprint API Reference Documentation</h1>
 <p>
-<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;
+<h3 align="center">5.0.0-rc2 </h3><hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html
index 470db26..3b7938f 100644
--- a/doc/gutenprint/html/list_8h.html
+++ b/doc/gutenprint/html/list_8h.html
@@ -2,133 +2,119 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#g71c64aeca8ca0613215306f088b6a963">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#ga0">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#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 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 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">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">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 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 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 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 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 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 compare two nodes.  <a href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f"></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#ga5"></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#gb357e17f729e41b4f96d6aada1be26b9">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#ga6">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#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">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">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">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">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">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">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">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">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 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 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 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 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 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 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 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 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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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 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 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 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 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">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">Set the data associated with a list item.  <a href="group__list.html#g1b5d2889a81d712c3ba024e53bfd0f38"></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#ga31"></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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html
index 244163d..d3174c8 100644
--- a/doc/gutenprint/html/module_8h.html
+++ b/doc/gutenprint/html/module_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -32,40 +18,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#a6058b6828d19e60a3e6c86b242da863">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#a0">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#1bc0723b8b43547b333980913ea42965">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#a1">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#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>, 
+<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>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d47128dd421ef22c57a852b5157b3627c">STP_MODULE_CLASS_DITHER</a>
+&nbsp;&nbsp;<a class="el" href="module_8h.html#a13a6">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#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#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#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#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#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#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#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#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#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">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"><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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Module functions. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="1bc0723b8b43547b333980913ea42965"></a><!-- doxytag: member="module.h::stp_module_t" ref="1bc0723b8b43547b333980913ea42965" args="" --><p>
+<a class="anchor" name="a1"></a><!-- doxytag: member="module.h::stp_module_t" ref="a1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -88,7 +74,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a6058b6828d19e60a3e6c86b242da863"></a><!-- doxytag: member="module.h::stp_module_version_t" ref="a6058b6828d19e60a3e6c86b242da863" args="" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="module.h::stp_module_version_t" ref="a0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -112,13 +98,13 @@ Module functions.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="df2656b9a248237bdf28247c133a046d"></a><!-- doxytag: member="module.h::stp_module_class_t" ref="df2656b9a248237bdf28247c133a046d" args="" --><p>
+<a class="anchor" name="a13"></a><!-- doxytag: member="module.h::stp_module_class_t" ref="a13" 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#df2656b9a248237bdf28247c133a046d">stp_module_class_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="module_8h.html#a13">stp_module_class_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -134,15 +120,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="df2656b9a248237bdf28247c133a046d3e5e52c14fb2598ee9f26fc2ac954452"></a><!-- doxytag: member="STP_MODULE_CLASS_INVALID" ref="df2656b9a248237bdf28247c133a046d3e5e52c14fb2598ee9f26fc2ac954452" args="" -->STP_MODULE_CLASS_INVALID</em>&nbsp;</td><td>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
 </table>
 </dl>
@@ -150,7 +136,7 @@ Module functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="8e114f6e561ea2a5c4186b31eea363ad"></a><!-- doxytag: member="module.h::stp_module_close" ref="8e114f6e561ea2a5c4186b31eea363ad" args="(stp_list_item_t *module)" --><p>
+<a class="anchor" name="a11"></a><!-- doxytag: member="module.h::stp_module_close" ref="a11" args="(stp_list_item_t *module)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -158,7 +144,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#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&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="mdname1" valign="top" nowrap> <em>module</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -178,7 +164,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5bfe6fda569e476ad52024d31eca3c4"></a><!-- doxytag: member="module.h::stp_module_exit" ref="a5bfe6fda569e476ad52024d31eca3c4" args="(void)" --><p>
+<a class="anchor" name="a8"></a><!-- doxytag: member="module.h::stp_module_exit" ref="a8" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -206,15 +192,15 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="60ee652d3ddc0bf99abc8155b4e35a01"></a><!-- doxytag: member="module.h::stp_module_get_class" ref="60ee652d3ddc0bf99abc8155b4e35a01" args="(stp_module_class_t class)" --><p>
+<a class="anchor" name="a12"></a><!-- doxytag: member="module.h::stp_module_get_class" ref="a12" 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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>* stp_module_get_class           </td>
+          <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" valign="top">(&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="md" nowrap valign="top"><a class="el" href="module_8h.html#a13">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>
@@ -234,7 +220,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="8d52ac8df2ff7c4a28900fbb598c4848"></a><!-- doxytag: member="module.h::stp_module_init" ref="8d52ac8df2ff7c4a28900fbb598c4848" args="(void)" --><p>
+<a class="anchor" name="a10"></a><!-- doxytag: member="module.h::stp_module_init" ref="a10" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -262,7 +248,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="b07deb48be35f70644fcc6013b4debd9"></a><!-- doxytag: member="module.h::stp_module_load" ref="b07deb48be35f70644fcc6013b4debd9" args="(void)" --><p>
+<a class="anchor" name="a7"></a><!-- doxytag: member="module.h::stp_module_load" ref="a7" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -290,7 +276,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="401000da13e2a7aacab2738838bf1fb2"></a><!-- doxytag: member="module.h::stp_module_open" ref="401000da13e2a7aacab2738838bf1fb2" args="(const char *modulename)" --><p>
+<a class="anchor" name="a9"></a><!-- doxytag: member="module.h::stp_module_open" ref="a9" args="(const char *modulename)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -318,8 +304,8 @@ Module functions.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html
index fe35819..a1acb0e 100644
--- a/doc/gutenprint/html/modules.html
+++ b/doc/gutenprint/html/modules.html
@@ -2,18 +2,9 @@
 <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.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>
+<!-- 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>
 <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>
@@ -29,8 +20,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html
index 857fdf1..ca600fe 100644
--- a/doc/gutenprint/html/mxml_8h.html
+++ b/doc/gutenprint/html/mxml_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -42,101 +28,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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#7183b4ceb133647a5b559de1549356d1">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#a13">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#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 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 <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__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__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__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__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="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="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="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="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 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 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#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>, 
+<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>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1327390d3a536298d1c0a4da5f8a26fb6">STP_MXML_TEXT</a>
+&nbsp;&nbsp;<a class="el" href="mxml_8h.html#a43a24">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#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#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#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">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">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">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">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">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"><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#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#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#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#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#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#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#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#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#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#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#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#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#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#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"><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">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">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">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">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">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#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#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">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"><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#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#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>
+<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>
 
 </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="aef62f3dd5005be25edf46856ffd0e67"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_AFTER" ref="aef62f3dd5005be25edf46856ffd0e67" args="" --><p>
+<a class="anchor" name="a12"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_AFTER" ref="a12" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -159,7 +145,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="7ac1110fe031c1c8274171dda7c65ee8"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_BEFORE" ref="7ac1110fe031c1c8274171dda7c65ee8" args="" --><p>
+<a class="anchor" name="a11"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_BEFORE" ref="a11" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -182,7 +168,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="7183b4ceb133647a5b559de1549356d1"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_TO_PARENT" ref="7183b4ceb133647a5b559de1549356d1" args="" --><p>
+<a class="anchor" name="a13"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_TO_PARENT" ref="a13" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -205,7 +191,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="2ed08f4813ad57773f412970856517f5"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND" ref="2ed08f4813ad57773f412970856517f5" args="" --><p>
+<a class="anchor" name="a4"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND" ref="a4" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -228,7 +214,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="2692b08783d224aa4f726b13c4a7da68"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND_FIRST" ref="2692b08783d224aa4f726b13c4a7da68" args="" --><p>
+<a class="anchor" name="a6"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND_FIRST" ref="a6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -251,7 +237,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="70032c4eda848436305b71f40cf913f7"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_CALLBACK" ref="70032c4eda848436305b71f40cf913f7" args="" --><p>
+<a class="anchor" name="a2"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_CALLBACK" ref="a2" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -274,7 +260,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="42831d4e1a69e57461d655f610bb995a"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_DESCEND" ref="42831d4e1a69e57461d655f610bb995a" args="" --><p>
+<a class="anchor" name="a5"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_DESCEND" ref="a5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -297,7 +283,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="934b8d5744f37ba24d529a86f6e5f2e7"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_PARENT" ref="934b8d5744f37ba24d529a86f6e5f2e7" args="" --><p>
+<a class="anchor" name="a3"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_PARENT" ref="a3" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -320,7 +306,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="24760270636887d4dbbccca15164f4eb"></a><!-- doxytag: member="mxml.h::STP_MXML_TAB" ref="24760270636887d4dbbccca15164f4eb" args="" --><p>
+<a class="anchor" name="a1"></a><!-- doxytag: member="mxml.h::STP_MXML_TAB" ref="a1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -343,7 +329,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="76508c60800b84b90acf4e0f8e04288e"></a><!-- doxytag: member="mxml.h::STP_MXML_WRAP" ref="76508c60800b84b90acf4e0f8e04288e" args="" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="mxml.h::STP_MXML_WRAP" ref="a0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -366,7 +352,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="1ffe9b0d18eb95e8b85da3d09b195aee"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_CLOSE" ref="1ffe9b0d18eb95e8b85da3d09b195aee" args="" --><p>
+<a class="anchor" name="a10"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_CLOSE" ref="a10" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -389,7 +375,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="312f2553f5c5e2f974ca8f238064dadd"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_OPEN" ref="312f2553f5c5e2f974ca8f238064dadd" args="" --><p>
+<a class="anchor" name="a8"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_OPEN" ref="a8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -412,7 +398,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="5ef0809e92527718236cf91e591f1276"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_CLOSE" ref="5ef0809e92527718236cf91e591f1276" args="" --><p>
+<a class="anchor" name="a9"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_CLOSE" ref="a9" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -435,7 +421,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="85b05ecef2dd56e2d66b0c3057705a9b"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_OPEN" ref="85b05ecef2dd56e2d66b0c3057705a9b" args="" --><p>
+<a class="anchor" name="a7"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_OPEN" ref="a7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -459,7 +445,7 @@ Mini-XML XML parsing functions.
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="1ed814dbc1628ca237bed68e27043438"></a><!-- doxytag: member="mxml.h::stp_mxml_attr_t" ref="1ed814dbc1628ca237bed68e27043438" args="" --><p>
+<a class="anchor" name="a15"></a><!-- doxytag: member="mxml.h::stp_mxml_attr_t" ref="a15" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -482,7 +468,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="504a90f35ed408a7f80f6dbdadf45ae4"></a><!-- doxytag: member="mxml.h::stp_mxml_element_t" ref="504a90f35ed408a7f80f6dbdadf45ae4" args="" --><p>
+<a class="anchor" name="a16"></a><!-- doxytag: member="mxml.h::stp_mxml_element_t" ref="a16" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -505,7 +491,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="1d1a605dff310b7538b297c8e63b1d88"></a><!-- doxytag: member="mxml.h::stp_mxml_node_t" ref="1d1a605dff310b7538b297c8e63b1d88" args="" --><p>
+<a class="anchor" name="a19"></a><!-- doxytag: member="mxml.h::stp_mxml_node_t" ref="a19" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -528,7 +514,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a2b9c7f1c79258abe63be05529b2a908"></a><!-- doxytag: member="mxml.h::stp_mxml_text_t" ref="a2b9c7f1c79258abe63be05529b2a908" args="" --><p>
+<a class="anchor" name="a17"></a><!-- doxytag: member="mxml.h::stp_mxml_text_t" ref="a17" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -551,13 +537,13 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="1ed6fadf477121e16a83bc1899c30d5c"></a><!-- doxytag: member="mxml.h::stp_mxml_type_t" ref="1ed6fadf477121e16a83bc1899c30d5c" args="" --><p>
+<a class="anchor" name="a14"></a><!-- doxytag: member="mxml.h::stp_mxml_type_t" ref="a14" 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#dc40006361fa674950bded00ecfe2af1">stp_mxml_type_e</a>  <a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">stp_mxml_type_t</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -574,7 +560,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="d162e4b65493580e8bee75ef0c8c12b6"></a><!-- doxytag: member="mxml.h::stp_mxml_value_t" ref="d162e4b65493580e8bee75ef0c8c12b6" args="" --><p>
+<a class="anchor" name="a18"></a><!-- doxytag: member="mxml.h::stp_mxml_value_t" ref="a18" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -598,13 +584,13 @@ Mini-XML XML parsing functions.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="dc40006361fa674950bded00ecfe2af1"></a><!-- doxytag: member="mxml.h::stp_mxml_type_e" ref="dc40006361fa674950bded00ecfe2af1" args="" --><p>
+<a class="anchor" name="a43"></a><!-- doxytag: member="mxml.h::stp_mxml_type_e" ref="a43" 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#dc40006361fa674950bded00ecfe2af1">stp_mxml_type_e</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="mxml_8h.html#a43">stp_mxml_type_e</a>          </td>
         </tr>
       </table>
     </td>
@@ -620,15 +606,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="dc40006361fa674950bded00ecfe2af14ba5265c3afb36dd232d06654057b5e0"></a><!-- doxytag: member="STP_MXML_ELEMENT" ref="dc40006361fa674950bded00ecfe2af14ba5265c3afb36dd232d06654057b5e0" args="" -->STP_MXML_ELEMENT</em>&nbsp;</td><td>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
 </table>
 </dl>
@@ -636,7 +622,7 @@ Mini-XML XML parsing functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -685,7 +671,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="cbdf0579701e7776af87fbb3c2bf9469"></a><!-- doxytag: member="mxml.h::stp_mxmlDelete" ref="cbdf0579701e7776af87fbb3c2bf9469" args="(stp_mxml_node_t *node)" --><p>
+<a class="anchor" name="a26"></a><!-- doxytag: member="mxml.h::stp_mxmlDelete" ref="a26" args="(stp_mxml_node_t *node)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -713,7 +699,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="23f0ed075c389d9681fb5ed3c2ecddb9"></a><!-- doxytag: member="mxml.h::stp_mxmlElementGetAttr" ref="23f0ed075c389d9681fb5ed3c2ecddb9" args="(stp_mxml_node_t *node, const char *name)" --><p>
+<a class="anchor" name="a27"></a><!-- doxytag: member="mxml.h::stp_mxmlElementGetAttr" ref="a27" args="(stp_mxml_node_t *node, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -750,7 +736,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -793,7 +779,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -854,7 +840,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -874,7 +860,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#1ed6fadf477121e16a83bc1899c30d5c">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#a14">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>
@@ -897,7 +883,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -917,7 +903,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#1ed6fadf477121e16a83bc1899c30d5c">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#a14">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>
@@ -940,7 +926,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="305b60c2a9554ac30bb195e42cc82e75"></a><!-- doxytag: member="mxml.h::stp_mxmlNewElement" ref="305b60c2a9554ac30bb195e42cc82e75" args="(stp_mxml_node_t *parent, const char *name)" --><p>
+<a class="anchor" name="a32"></a><!-- doxytag: member="mxml.h::stp_mxmlNewElement" ref="a32" args="(stp_mxml_node_t *parent, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -977,7 +963,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="e65d5658c5271a9e26c5a21bc0cc2f20"></a><!-- doxytag: member="mxml.h::stp_mxmlNewInteger" ref="e65d5658c5271a9e26c5a21bc0cc2f20" args="(stp_mxml_node_t *parent, int integer)" --><p>
+<a class="anchor" name="a33"></a><!-- doxytag: member="mxml.h::stp_mxmlNewInteger" ref="a33" args="(stp_mxml_node_t *parent, int integer)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1014,7 +1000,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="533ea6ec53f37f8bdd2d89d667b0d10a"></a><!-- doxytag: member="mxml.h::stp_mxmlNewOpaque" ref="533ea6ec53f37f8bdd2d89d667b0d10a" args="(stp_mxml_node_t *parent, const char *opaque)" --><p>
+<a class="anchor" name="a34"></a><!-- doxytag: member="mxml.h::stp_mxmlNewOpaque" ref="a34" args="(stp_mxml_node_t *parent, const char *opaque)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1051,7 +1037,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="7754bd0d9af2be6edaeac7edf9c89c93"></a><!-- doxytag: member="mxml.h::stp_mxmlNewReal" ref="7754bd0d9af2be6edaeac7edf9c89c93" args="(stp_mxml_node_t *parent, double real)" --><p>
+<a class="anchor" name="a35"></a><!-- doxytag: member="mxml.h::stp_mxmlNewReal" ref="a35" args="(stp_mxml_node_t *parent, double real)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1088,7 +1074,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1131,7 +1117,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="6abe55831d77332db6b94b6cc0caaf02"></a><!-- doxytag: member="mxml.h::stp_mxmlRemove" ref="6abe55831d77332db6b94b6cc0caaf02" args="(stp_mxml_node_t *node)" --><p>
+<a class="anchor" name="a37"></a><!-- doxytag: member="mxml.h::stp_mxmlRemove" ref="a37" args="(stp_mxml_node_t *node)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1159,7 +1145,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1196,7 +1182,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1239,7 +1225,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1288,7 +1274,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1331,7 +1317,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1374,8 +1360,8 @@ Mini-XML XML parsing functions.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html
index cf711ee..8aba885 100644
--- a/doc/gutenprint/html/pages.html
+++ b/doc/gutenprint/html/pages.html
@@ -2,24 +2,15 @@
 <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.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>
+<!-- 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>
 <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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html
index cef07ec..c987743 100644
--- a/doc/gutenprint/html/paper_8h.html
+++ b/doc/gutenprint/html/paper_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -31,34 +17,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#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>
+<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>
  }</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 class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#ga5">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#g93eb4d6bc44914b3ea6b184e076a0853">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#ga0">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#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 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 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 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 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 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 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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Paper size functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html
index bb6083c..8bd6b7f 100644
--- a/doc/gutenprint/html/path_8h.html
+++ b/doc/gutenprint/html/path_8h.html
@@ -2,48 +2,34 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#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"><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">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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Simple directory path functions. 
 <p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="8591072873a5ee644a6dd22538d84c55"></a><!-- doxytag: member="path.h::stp_path_search" ref="8591072873a5ee644a6dd22538d84c55" args="(stp_list_t *dirlist, const char *suffix)" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="path.h::stp_path_search" ref="a0" 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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>* stp_path_search           </td>
+          <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" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>dirlist</em>, </td>
         </tr>
         <tr>
@@ -72,7 +58,7 @@ Simple directory path functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="bc40460305f1f4f972c08a439f406449"></a><!-- doxytag: member="path.h::stp_path_split" ref="bc40460305f1f4f972c08a439f406449" args="(stp_list_t *list, const char *path)" --><p>
+<a class="anchor" name="a1"></a><!-- doxytag: member="path.h::stp_path_split" ref="a1" args="(stp_list_t *list, const char *path)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -80,7 +66,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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -109,8 +95,8 @@ Simple directory path functions.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html
index ef20727..5afc427 100644
--- a/doc/gutenprint/html/printers_8h.html
+++ b/doc/gutenprint/html/printers_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -33,82 +19,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#g1a68662b730d44c11de6fb8226a309f6">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#ga0">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#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 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 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#gc0a8108170f5c86621de14296fd94b1e">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#ga2">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#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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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">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">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">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">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">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">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="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="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#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#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#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#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">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">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">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"><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"><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">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">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">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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Printer functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html
index f07d513..fc6a343 100644
--- a/doc/gutenprint/html/sequence_8h.html
+++ b/doc/gutenprint/html/sequence_8h.html
@@ -2,124 +2,110 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#gb3d4cae653c4303a6e5d26b516694c92">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#ga0">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#gb3d4cae653c4303a6e5d26b516694c92"></a><br></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 colspan="2"><br><h2>Functions</h2></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="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="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">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">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">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">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 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 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">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">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">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">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 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 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">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">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">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">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">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">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 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 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">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">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">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">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">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">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">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">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 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 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 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 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 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 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 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 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 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 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 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 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">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">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 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 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 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 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 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 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 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 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 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 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 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 unsigned short data.  <a href="group__sequence.html#g8bf46faeea891ac7ca699591df596bc1"></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#ga28"></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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html
index 69c9620..ed0752b 100644
--- a/doc/gutenprint/html/string-list_8h.html
+++ b/doc/gutenprint/html/string-list_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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">
@@ -30,42 +16,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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">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#a0">stp_string_list_t</a></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 class="mdescLeft">&nbsp;</td><td class="mdescRight">The string_list opaque data type.  <a href="#a0"></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#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"><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">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">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"><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#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#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"><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">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">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"><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"><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">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#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#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">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"><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"><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">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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 String list functions. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="6ec7eafa9cb77e5c4c2502e19f1a3f5b"></a><!-- doxytag: member="string-list.h::stp_string_list_t" ref="6ec7eafa9cb77e5c4c2502e19f1a3f5b" args="" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="string-list.h::stp_string_list_t" ref="a0" 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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">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#a0">stp_string_list_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -85,7 +71,7 @@ The string_list opaque data type.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -93,7 +79,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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -128,7 +114,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -136,7 +122,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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&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="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -156,13 +142,13 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="65077aa7201209fcaa58553d904fbc34"></a><!-- doxytag: member="string-list.h::stp_string_list_create" ref="65077aa7201209fcaa58553d904fbc34" args="(void)" --><p>
+<a class="anchor" name="a1"></a><!-- doxytag: member="string-list.h::stp_string_list_create" ref="a1" 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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a>* stp_string_list_create           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -184,15 +170,15 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">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#a0">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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&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="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -212,13 +198,13 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">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#a0">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>
@@ -249,7 +235,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="35638794468f0bb0dd7b912dac655bd5"></a><!-- doxytag: member="string-list.h::stp_string_list_destroy" ref="35638794468f0bb0dd7b912dac655bd5" args="(stp_string_list_t *list)" --><p>
+<a class="anchor" name="a2"></a><!-- doxytag: member="string-list.h::stp_string_list_destroy" ref="a2" args="(stp_string_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -257,7 +243,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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&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="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -277,7 +263,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -285,7 +271,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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -314,7 +300,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -322,7 +308,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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -351,7 +337,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -359,7 +345,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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -388,7 +374,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -396,7 +382,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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&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="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -425,8 +411,8 @@ The string_list opaque data type.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html
index 90c736e..8c60728 100644
--- a/doc/gutenprint/html/structdither__matrix__impl.html
+++ b/doc/gutenprint/html/structdither__matrix__impl.html
@@ -2,68 +2,53 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#6055652d6d84e1c46e19438c923113ff">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#o12">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#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#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#21b72c0b7adc5c7b4a50ffcb90d92dd6">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#o14">matrix</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="593616de15330c0fb2d55e55410bf994"></a><!-- doxytag: member="dither_matrix_impl::base" ref="593616de15330c0fb2d55e55410bf994" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="dither_matrix_impl::base" ref="o0" 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#593616de15330c0fb2d55e55410bf994">dither_matrix_impl::base</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o0">dither_matrix_impl::base</a>          </td>
         </tr>
       </table>
     </td>
@@ -80,13 +65,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b0ab0254bd58eb87eaee3172ba49fefb"></a><!-- doxytag: member="dither_matrix_impl::exp" ref="b0ab0254bd58eb87eaee3172ba49fefb" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="dither_matrix_impl::exp" ref="o1" 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#b0ab0254bd58eb87eaee3172ba49fefb">dither_matrix_impl::exp</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o1">dither_matrix_impl::exp</a>          </td>
         </tr>
       </table>
     </td>
@@ -103,13 +88,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="31acd511b5ec97637395c849e2089e00"></a><!-- doxytag: member="dither_matrix_impl::fast_mask" ref="31acd511b5ec97637395c849e2089e00" args="" --><p>
+<a class="anchor" name="o13"></a><!-- doxytag: member="dither_matrix_impl::fast_mask" ref="o13" 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#31acd511b5ec97637395c849e2089e00">dither_matrix_impl::fast_mask</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structdither__matrix__impl.html#o13">dither_matrix_impl::fast_mask</a>          </td>
         </tr>
       </table>
     </td>
@@ -126,13 +111,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="618931f210c709ac7c0a44ed090aef93"></a><!-- doxytag: member="dither_matrix_impl::i_own" ref="618931f210c709ac7c0a44ed090aef93" args="" --><p>
+<a class="anchor" name="o10"></a><!-- doxytag: member="dither_matrix_impl::i_own" ref="o10" 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#618931f210c709ac7c0a44ed090aef93">dither_matrix_impl::i_own</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o10">dither_matrix_impl::i_own</a>          </td>
         </tr>
       </table>
     </td>
@@ -149,13 +134,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="6a992d5529f459a44fee58c733255e86"></a><!-- doxytag: member="dither_matrix_impl::index" ref="6a992d5529f459a44fee58c733255e86" args="" --><p>
+<a class="anchor" name="o9"></a><!-- doxytag: member="dither_matrix_impl::index" ref="o9" 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#6a992d5529f459a44fee58c733255e86">dither_matrix_impl::index</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o9">dither_matrix_impl::index</a>          </td>
         </tr>
       </table>
     </td>
@@ -172,13 +157,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="94f66fddf2c8dd22340220c82f6115fd"></a><!-- doxytag: member="dither_matrix_impl::last_x" ref="94f66fddf2c8dd22340220c82f6115fd" args="" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="dither_matrix_impl::last_x" ref="o5" 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#94f66fddf2c8dd22340220c82f6115fd">dither_matrix_impl::last_x</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o5">dither_matrix_impl::last_x</a>          </td>
         </tr>
       </table>
     </td>
@@ -195,13 +180,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="f1cbd20a4cb7668e3b450ae3c7879fb2"></a><!-- doxytag: member="dither_matrix_impl::last_x_mod" ref="f1cbd20a4cb7668e3b450ae3c7879fb2" args="" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="dither_matrix_impl::last_x_mod" ref="o6" 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#f1cbd20a4cb7668e3b450ae3c7879fb2">dither_matrix_impl::last_x_mod</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o6">dither_matrix_impl::last_x_mod</a>          </td>
         </tr>
       </table>
     </td>
@@ -218,13 +203,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="dcf093deead926d5e89cdf4cf72068cf"></a><!-- doxytag: member="dither_matrix_impl::last_y" ref="dcf093deead926d5e89cdf4cf72068cf" args="" --><p>
+<a class="anchor" name="o7"></a><!-- doxytag: member="dither_matrix_impl::last_y" ref="o7" 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#dcf093deead926d5e89cdf4cf72068cf">dither_matrix_impl::last_y</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o7">dither_matrix_impl::last_y</a>          </td>
         </tr>
       </table>
     </td>
@@ -241,13 +226,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="ea9a91cee135cee3ba2750f2875cf610"></a><!-- doxytag: member="dither_matrix_impl::last_y_mod" ref="ea9a91cee135cee3ba2750f2875cf610" args="" --><p>
+<a class="anchor" name="o8"></a><!-- doxytag: member="dither_matrix_impl::last_y_mod" ref="o8" 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#ea9a91cee135cee3ba2750f2875cf610">dither_matrix_impl::last_y_mod</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o8">dither_matrix_impl::last_y_mod</a>          </td>
         </tr>
       </table>
     </td>
@@ -264,13 +249,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="21b72c0b7adc5c7b4a50ffcb90d92dd6"></a><!-- doxytag: member="dither_matrix_impl::matrix" ref="21b72c0b7adc5c7b4a50ffcb90d92dd6" args="" --><p>
+<a class="anchor" name="o14"></a><!-- doxytag: member="dither_matrix_impl::matrix" ref="o14" 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#21b72c0b7adc5c7b4a50ffcb90d92dd6">dither_matrix_impl::matrix</a>          </td>
+          <td class="md" nowrap valign="top">unsigned* <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl::matrix</a>          </td>
         </tr>
       </table>
     </td>
@@ -287,13 +272,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2cd6b347ff013dd494370a9938344885"></a><!-- doxytag: member="dither_matrix_impl::total_size" ref="2cd6b347ff013dd494370a9938344885" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="dither_matrix_impl::total_size" ref="o4" 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#2cd6b347ff013dd494370a9938344885">dither_matrix_impl::total_size</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o4">dither_matrix_impl::total_size</a>          </td>
         </tr>
       </table>
     </td>
@@ -310,13 +295,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="80997876f6afba983eaec918e58ecc0d"></a><!-- doxytag: member="dither_matrix_impl::x_offset" ref="80997876f6afba983eaec918e58ecc0d" args="" --><p>
+<a class="anchor" name="o11"></a><!-- doxytag: member="dither_matrix_impl::x_offset" ref="o11" 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#80997876f6afba983eaec918e58ecc0d">dither_matrix_impl::x_offset</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o11">dither_matrix_impl::x_offset</a>          </td>
         </tr>
       </table>
     </td>
@@ -333,13 +318,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="f0ed41c0ec21ebf3f06c1a1ec9d04456"></a><!-- doxytag: member="dither_matrix_impl::x_size" ref="f0ed41c0ec21ebf3f06c1a1ec9d04456" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="dither_matrix_impl::x_size" ref="o2" 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#f0ed41c0ec21ebf3f06c1a1ec9d04456">dither_matrix_impl::x_size</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o2">dither_matrix_impl::x_size</a>          </td>
         </tr>
       </table>
     </td>
@@ -356,13 +341,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="6055652d6d84e1c46e19438c923113ff"></a><!-- doxytag: member="dither_matrix_impl::y_offset" ref="6055652d6d84e1c46e19438c923113ff" args="" --><p>
+<a class="anchor" name="o12"></a><!-- doxytag: member="dither_matrix_impl::y_offset" ref="o12" 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#6055652d6d84e1c46e19438c923113ff">dither_matrix_impl::y_offset</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl::y_offset</a>          </td>
         </tr>
       </table>
     </td>
@@ -379,13 +364,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="6f8a30ff8882b910eb6092965bff1166"></a><!-- doxytag: member="dither_matrix_impl::y_size" ref="6f8a30ff8882b910eb6092965bff1166" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="dither_matrix_impl::y_size" ref="o3" 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#6f8a30ff8882b910eb6092965bff1166">dither_matrix_impl::y_size</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl::y_size</a>          </td>
         </tr>
       </table>
     </td>
@@ -404,8 +389,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 af05a28..ab5987c 100644
--- a/doc/gutenprint/html/structstp__cached__curve__t.html
+++ b/doc/gutenprint/html/structstp__cached__curve__t.html
@@ -2,46 +2,31 @@
 <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.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>
+<!-- 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>
 <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#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"><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">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 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 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">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">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#e2942a04780e223b215eb8b663cf5353">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#o3">count</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="e2942a04780e223b215eb8b663cf5353"></a><!-- doxytag: member="stp_cached_curve_t::count" ref="e2942a04780e223b215eb8b663cf5353" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_cached_curve_t::count" ref="o3" 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#e2942a04780e223b215eb8b663cf5353">stp_cached_curve_t::count</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -58,13 +43,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="4efa264f5ef3e1a5c95736e07544ebf0"></a><!-- doxytag: member="stp_cached_curve_t::curve" ref="4efa264f5ef3e1a5c95736e07544ebf0" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_cached_curve_t::curve" ref="o0" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* <a class="el" href="structstp__cached__curve__t.html#4efa264f5ef3e1a5c95736e07544ebf0">stp_cached_curve_t::curve</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -81,13 +66,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="f7e3e9aa11a7dd4199647af2e87a3bab"></a><!-- doxytag: member="stp_cached_curve_t::d_cache" ref="f7e3e9aa11a7dd4199647af2e87a3bab" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_cached_curve_t::d_cache" ref="o1" 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#f7e3e9aa11a7dd4199647af2e87a3bab">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#o1">stp_cached_curve_t::d_cache</a>          </td>
         </tr>
       </table>
     </td>
@@ -104,13 +89,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9c9886e8af38f75727d2b354afa8f218"></a><!-- doxytag: member="stp_cached_curve_t::s_cache" ref="9c9886e8af38f75727d2b354afa8f218" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_cached_curve_t::s_cache" ref="o2" 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#9c9886e8af38f75727d2b354afa8f218">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#o2">stp_cached_curve_t::s_cache</a>          </td>
         </tr>
       </table>
     </td>
@@ -129,8 +114,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color.html
index 1b8d608..5fd1475 100644
--- a/doc/gutenprint/html/structstp__color.html
+++ b/doc/gutenprint/html/structstp__color.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_color Struct Reference<br>
 <small>
 [<a class="el" href="group__color.html">color</a>]</small>
@@ -28,21 +13,21 @@
 <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#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="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#2fc6351aa4209f68fb16e85c6104f96c">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#o1">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="structstp__color.html#a3f019e45920da0adf4ce2eec4cc2e7c">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#o2">colorfuncs</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="a3f019e45920da0adf4ce2eec4cc2e7c"></a><!-- doxytag: member="stp_color::colorfuncs" ref="a3f019e45920da0adf4ce2eec4cc2e7c" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_color::colorfuncs" ref="o2" 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="structstp__color.html#a3f019e45920da0adf4ce2eec4cc2e7c">stp_color::colorfuncs</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#o2">stp_color::colorfuncs</a>          </td>
         </tr>
       </table>
     </td>
@@ -59,13 +44,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2fc6351aa4209f68fb16e85c6104f96c"></a><!-- doxytag: member="stp_color::long_name" ref="2fc6351aa4209f68fb16e85c6104f96c" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_color::long_name" ref="o1" 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>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__color.html#o1">stp_color::long_name</a>          </td>
         </tr>
       </table>
     </td>
@@ -82,13 +67,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="4698bac7fdbf14511adbe13aeefe80b8"></a><!-- doxytag: member="stp_color::short_name" ref="4698bac7fdbf14511adbe13aeefe80b8" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_color::short_name" ref="o0" 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>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__color.html#o0">stp_color::short_name</a>          </td>
         </tr>
       </table>
     </td>
@@ -107,8 +92,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html
index e5582f0..f87b829 100644
--- a/doc/gutenprint/html/structstp__colorfuncs__t.html
+++ b/doc/gutenprint/html/structstp__colorfuncs__t.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_colorfuncs_t Struct Reference<br>
 <small>
 [<a class="el" href="group__color.html">color</a>]</small>
@@ -28,23 +13,23 @@
 <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#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="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#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">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#o1">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#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"><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__colorfuncs__t.html#o2">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="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>
+<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#o3">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>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<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>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_colorfuncs_t::describe_parameter" ref="o3" 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="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>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__colorfuncs__t.html#o3">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>
       </table>
     </td>
@@ -61,13 +46,13 @@
     </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>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_colorfuncs_t::get_row" ref="o1" 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>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__colorfuncs__t.html#o1">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>
       </table>
     </td>
@@ -84,13 +69,13 @@
     </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>
+<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>
 <table 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>
+          <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>
         </tr>
       </table>
     </td>
@@ -107,13 +92,13 @@
     </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>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_colorfuncs_t::list_parameters" ref="o2" 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>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>(* <a class="el" href="structstp__colorfuncs__t.html#o2">stp_colorfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
     </td>
@@ -132,8 +117,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 5b950ee..62a667b 100644
--- a/doc/gutenprint/html/structstp__curve__point__t.html
+++ b/doc/gutenprint/html/structstp__curve__point__t.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_curve_point_t Struct Reference<br>
 <small>
 [<a class="el" href="group__curve.html">curve</a>]</small>
@@ -31,24 +16,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#9dd4e461268c8034f5c8564e155c67a6">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#o0">x</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">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">Vertical position.  <a href="#415290769594460e2e485922904f345d"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Vertical position.  <a href="#o1"></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="9dd4e461268c8034f5c8564e155c67a6"></a><!-- doxytag: member="stp_curve_point_t::x" ref="9dd4e461268c8034f5c8564e155c67a6" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_curve_point_t::x" ref="o0" 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#9dd4e461268c8034f5c8564e155c67a6">stp_curve_point_t::x</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__curve__point__t.html#o0">stp_curve_point_t::x</a>          </td>
         </tr>
       </table>
     </td>
@@ -67,13 +52,13 @@ Horizontal position.
     </td>
   </tr>
 </table>
-<a class="anchor" name="415290769594460e2e485922904f345d"></a><!-- doxytag: member="stp_curve_point_t::y" ref="415290769594460e2e485922904f345d" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_curve_point_t::y" ref="o1" 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#415290769594460e2e485922904f345d">stp_curve_point_t::y</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t::y</a>          </td>
         </tr>
       </table>
     </td>
@@ -94,8 +79,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 419065f..2e41381 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__generic.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__generic.html
@@ -2,48 +2,33 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#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#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#aa3d9d64037ca4cdd2a4d871d673bd73">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#o3">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#8d777f385d3dfec8815d20f7496026dc">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#o4">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="4b3a6218bb3e3a7303e8a171a60fcf92"></a><!-- doxytag: member="stp_dither_matrix_generic::bytes" ref="4b3a6218bb3e3a7303e8a171a60fcf92" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_dither_matrix_generic::bytes" ref="o2" 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#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_generic::bytes</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o2">stp_dither_matrix_generic::bytes</a>          </td>
         </tr>
       </table>
     </td>
@@ -60,13 +45,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="8d777f385d3dfec8815d20f7496026dc"></a><!-- doxytag: member="stp_dither_matrix_generic::data" ref="8d777f385d3dfec8815d20f7496026dc" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_dither_matrix_generic::data" ref="o4" 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#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_generic::data</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -83,13 +68,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="aa3d9d64037ca4cdd2a4d871d673bd73"></a><!-- doxytag: member="stp_dither_matrix_generic::prescaled" ref="aa3d9d64037ca4cdd2a4d871d673bd73" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_dither_matrix_generic::prescaled" ref="o3" 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#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_generic::prescaled</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o3">stp_dither_matrix_generic::prescaled</a>          </td>
         </tr>
       </table>
     </td>
@@ -106,13 +91,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9dd4e461268c8034f5c8564e155c67a6"></a><!-- doxytag: member="stp_dither_matrix_generic::x" ref="9dd4e461268c8034f5c8564e155c67a6" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dither_matrix_generic::x" ref="o0" 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#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_generic::x</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o0">stp_dither_matrix_generic::x</a>          </td>
         </tr>
       </table>
     </td>
@@ -129,13 +114,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="415290769594460e2e485922904f345d"></a><!-- doxytag: member="stp_dither_matrix_generic::y" ref="415290769594460e2e485922904f345d" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dither_matrix_generic::y" ref="o1" 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#415290769594460e2e485922904f345d">stp_dither_matrix_generic::y</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic::y</a>          </td>
         </tr>
       </table>
     </td>
@@ -154,8 +139,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 070c3fc..5651f5a 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__normal.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__normal.html
@@ -2,48 +2,33 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#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#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#aa3d9d64037ca4cdd2a4d871d673bd73">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#o3">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#8d777f385d3dfec8815d20f7496026dc">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#o4">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="4b3a6218bb3e3a7303e8a171a60fcf92"></a><!-- doxytag: member="stp_dither_matrix_normal::bytes" ref="4b3a6218bb3e3a7303e8a171a60fcf92" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_dither_matrix_normal::bytes" ref="o2" 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#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_normal::bytes</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o2">stp_dither_matrix_normal::bytes</a>          </td>
         </tr>
       </table>
     </td>
@@ -60,13 +45,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="8d777f385d3dfec8815d20f7496026dc"></a><!-- doxytag: member="stp_dither_matrix_normal::data" ref="8d777f385d3dfec8815d20f7496026dc" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_dither_matrix_normal::data" ref="o4" 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#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_normal::data</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -83,13 +68,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="aa3d9d64037ca4cdd2a4d871d673bd73"></a><!-- doxytag: member="stp_dither_matrix_normal::prescaled" ref="aa3d9d64037ca4cdd2a4d871d673bd73" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_dither_matrix_normal::prescaled" ref="o3" 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#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_normal::prescaled</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o3">stp_dither_matrix_normal::prescaled</a>          </td>
         </tr>
       </table>
     </td>
@@ -106,13 +91,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9dd4e461268c8034f5c8564e155c67a6"></a><!-- doxytag: member="stp_dither_matrix_normal::x" ref="9dd4e461268c8034f5c8564e155c67a6" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dither_matrix_normal::x" ref="o0" 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#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_normal::x</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o0">stp_dither_matrix_normal::x</a>          </td>
         </tr>
       </table>
     </td>
@@ -129,13 +114,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="415290769594460e2e485922904f345d"></a><!-- doxytag: member="stp_dither_matrix_normal::y" ref="415290769594460e2e485922904f345d" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dither_matrix_normal::y" ref="o1" 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#415290769594460e2e485922904f345d">stp_dither_matrix_normal::y</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal::y</a>          </td>
         </tr>
       </table>
     </td>
@@ -154,8 +139,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 aeef647..831ba2d 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__short.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__short.html
@@ -2,48 +2,33 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#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#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#aa3d9d64037ca4cdd2a4d871d673bd73">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#o3">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#8d777f385d3dfec8815d20f7496026dc">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#o4">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="4b3a6218bb3e3a7303e8a171a60fcf92"></a><!-- doxytag: member="stp_dither_matrix_short::bytes" ref="4b3a6218bb3e3a7303e8a171a60fcf92" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_dither_matrix_short::bytes" ref="o2" 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#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_short::bytes</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o2">stp_dither_matrix_short::bytes</a>          </td>
         </tr>
       </table>
     </td>
@@ -60,13 +45,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="8d777f385d3dfec8815d20f7496026dc"></a><!-- doxytag: member="stp_dither_matrix_short::data" ref="8d777f385d3dfec8815d20f7496026dc" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_dither_matrix_short::data" ref="o4" 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#8d777f385d3dfec8815d20f7496026dc">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#o4">stp_dither_matrix_short::data</a>          </td>
         </tr>
       </table>
     </td>
@@ -83,13 +68,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="aa3d9d64037ca4cdd2a4d871d673bd73"></a><!-- doxytag: member="stp_dither_matrix_short::prescaled" ref="aa3d9d64037ca4cdd2a4d871d673bd73" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_dither_matrix_short::prescaled" ref="o3" 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#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_short::prescaled</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o3">stp_dither_matrix_short::prescaled</a>          </td>
         </tr>
       </table>
     </td>
@@ -106,13 +91,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9dd4e461268c8034f5c8564e155c67a6"></a><!-- doxytag: member="stp_dither_matrix_short::x" ref="9dd4e461268c8034f5c8564e155c67a6" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dither_matrix_short::x" ref="o0" 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#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_short::x</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o0">stp_dither_matrix_short::x</a>          </td>
         </tr>
       </table>
     </td>
@@ -129,13 +114,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="415290769594460e2e485922904f345d"></a><!-- doxytag: member="stp_dither_matrix_short::y" ref="415290769594460e2e485922904f345d" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dither_matrix_short::y" ref="o1" 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#415290769594460e2e485922904f345d">stp_dither_matrix_short::y</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short::y</a>          </td>
         </tr>
       </table>
     </td>
@@ -154,8 +139,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize.html
index da485d3..1797d6d 100644
--- a/doc/gutenprint/html/structstp__dotsize.html
+++ b/doc/gutenprint/html/structstp__dotsize.html
@@ -2,42 +2,27 @@
 <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.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>
+<!-- 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>
 <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#67b7bfbc0ce2bbedbf5837e91f8773cd">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#o0">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#2063c1608d6e0baf80249c42e2be5804">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#o1">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="67b7bfbc0ce2bbedbf5837e91f8773cd"></a><!-- doxytag: member="stp_dotsize::bit_pattern" ref="67b7bfbc0ce2bbedbf5837e91f8773cd" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dotsize::bit_pattern" ref="o0" 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#67b7bfbc0ce2bbedbf5837e91f8773cd">stp_dotsize::bit_pattern</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__dotsize.html#o0">stp_dotsize::bit_pattern</a>          </td>
         </tr>
       </table>
     </td>
@@ -54,13 +39,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2063c1608d6e0baf80249c42e2be5804"></a><!-- doxytag: member="stp_dotsize::value" ref="2063c1608d6e0baf80249c42e2be5804" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dotsize::value" ref="o1" 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#2063c1608d6e0baf80249c42e2be5804">stp_dotsize::value</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__dotsize.html#o1">stp_dotsize::value</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,8 +64,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 b9115bd..b9bf4f2 100644
--- a/doc/gutenprint/html/structstp__double__bound__t.html
+++ b/doc/gutenprint/html/structstp__double__bound__t.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_double_bound_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -30,23 +15,23 @@
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></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 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 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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 double_bound (range) parameter. 
 <p>
-<hr><h2>Member Typedef Documentation</h2>
-<a class="anchor" name="81e073b428b50247daba38531dcf412a"></a><!-- doxytag: member="stp_double_bound_t::lower" ref="81e073b428b50247daba38531dcf412a" args="" --><p>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_double_bound_t::lower" ref="o0" 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 double <a class="el" href="structstp__double__bound__t.html#81e073b428b50247daba38531dcf412a">stp_double_bound_t::lower</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__double__bound__t.html#o0">stp_double_bound_t::lower</a>          </td>
         </tr>
       </table>
     </td>
@@ -63,13 +48,13 @@ double_bound (range) parameter.
 Lower bound.     </td>
   </tr>
 </table>
-<a class="anchor" name="0122b4c2c01ee1c698ecc309d2b8eb5a"></a><!-- doxytag: member="stp_double_bound_t::upper" ref="0122b4c2c01ee1c698ecc309d2b8eb5a" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_double_bound_t::upper" ref="o1" 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 double <a class="el" href="structstp__double__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">stp_double_bound_t::upper</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__double__bound__t.html#o1">stp_double_bound_t::upper</a>          </td>
         </tr>
       </table>
     </td>
@@ -88,8 +73,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__family.html b/doc/gutenprint/html/structstp__family.html
index d16bdb9..5d7f701 100644
--- a/doc/gutenprint/html/structstp__family.html
+++ b/doc/gutenprint/html/structstp__family.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_family Struct Reference<br>
 <small>
 [<a class="el" href="group__printer.html">printer</a>]</small>
@@ -28,19 +13,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#c0c2f50561daa16ae61c455b0861718a">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#o0">printfuncs</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>
+<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>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="505045dc6abce739a39cbc650ad05535"></a><!-- doxytag: member="stp_family::printer_list" ref="505045dc6abce739a39cbc650ad05535" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_family::printer_list" ref="o1" 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#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>* <a class="el" href="structstp__family.html#505045dc6abce739a39cbc650ad05535">stp_family::printer_list</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -57,13 +42,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="c0c2f50561daa16ae61c455b0861718a"></a><!-- doxytag: member="stp_family::printfuncs" ref="c0c2f50561daa16ae61c455b0861718a" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_family::printfuncs" ref="o0" 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#c0c2f50561daa16ae61c455b0861718a">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#o0">stp_family::printfuncs</a>          </td>
         </tr>
       </table>
     </td>
@@ -82,8 +67,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__image.html b/doc/gutenprint/html/structstp__image.html
index 3e90ed5..fabceaf 100644
--- a/doc/gutenprint/html/structstp__image.html
+++ b/doc/gutenprint/html/structstp__image.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_image Struct Reference<br>
 <small>
 [<a class="el" href="group__image.html">image</a>]</small>
@@ -31,44 +16,44 @@
 <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#9aebe24f43e2fe0d4342495a64026baa">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#o0">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="#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 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="structstp__image.html#o1">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="#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 is called to reset the image to the beginning.  <a href="#o1"></a><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#o2">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="#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 width of the image in pixels.  <a href="#o2"></a><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#o3">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="#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 returns the height of the image in pixels.  <a href="#o3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#ga9">stp_image_status_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#o4">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="#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 transfers the data from the image to the gimp-print library.  <a href="#o4"></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#o5">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="#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 returns the name of the application.  <a href="#o5"></a><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#o6">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="#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">This callback is called at the end of each page.  <a href="#o6"></a><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#o7">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="#75a384057459ae8e69fb9a98a249b4f4"></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="#o7"></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="6af9f0bf8a602f4a937c6e207a03ec01"></a><!-- doxytag: member="stp_image::conclude" ref="6af9f0bf8a602f4a937c6e207a03ec01" args=")(struct stp_image *image)" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="stp_image::conclude" ref="o6" 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#6af9f0bf8a602f4a937c6e207a03ec01">stp_image::conclude</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#o6">stp_image::conclude</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -87,13 +72,13 @@ This callback is called at the end of each page.
     </td>
   </tr>
 </table>
-<a class="anchor" name="e9495dba1df955709ebbd651c1a526e6"></a><!-- doxytag: member="stp_image::get_appname" ref="e9495dba1df955709ebbd651c1a526e6" args=")(struct stp_image *image)" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="stp_image::get_appname" ref="o5" 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>
+          <td class="md" nowrap valign="top">const char*(* <a class="el" href="structstp__image.html#o5">stp_image::get_appname</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -109,16 +94,16 @@ This callback is called at the end of each page.
 <p>
 This callback returns the name of the application. 
 <p>
-This is embedded in the output by some drivers.     </td>
+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>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_image::get_row" ref="o4" 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>
+          <td class="md" nowrap valign="top"><a class="el" href="group__image.html#ga9">stp_image_status_t</a>(* <a class="el" href="structstp__image.html#o4">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>
@@ -134,24 +119,24 @@ This is embedded in the output by some drivers.     </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>
+It is called from the driver layer. It should copy WIDTH (as returned by the <a class="el" href="structstp__image.html#o2">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>data</em>&nbsp;</td><td>a pointer to <a class="el" href="structstp__image.html#o2">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>
+    <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>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_image::height" ref="o3" 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>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__image.html#o3">stp_image::height</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -169,19 +154,19 @@ 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>
+    <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>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_image::init" ref="o0" 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>
+          <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>
         </tr>
       </table>
     </td>
@@ -199,19 +184,19 @@ 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>
+<a class="anchor" name="o7"></a><!-- doxytag: member="stp_image::rep" ref="o7" 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>
+          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__image.html#o7">stp_image::rep</a>          </td>
         </tr>
       </table>
     </td>
@@ -230,13 +215,13 @@ A pointer to an application-specific state information that might need to be ass
     </td>
   </tr>
 </table>
-<a class="anchor" name="edae63ed1524916fdef45cb652d7275e"></a><!-- doxytag: member="stp_image::reset" ref="edae63ed1524916fdef45cb652d7275e" args=")(struct stp_image *image)" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_image::reset" ref="o1" 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>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__image.html#o1">stp_image::reset</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -252,22 +237,22 @@ A pointer to an application-specific state information that might need to be ass
 <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>
+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#o1">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>
+    <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>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_image::width" ref="o2" 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>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__image.html#o2">stp_image::width</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -285,7 +270,7 @@ 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>
+    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use.</td></tr>
   </table>
 </dl>
     </td>
@@ -293,8 +278,8 @@ This callback returns the width of the image in pixels.
 </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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 fd170f6..2c5fb30 100644
--- a/doc/gutenprint/html/structstp__int__bound__t.html
+++ b/doc/gutenprint/html/structstp__int__bound__t.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_int_bound_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -30,23 +15,23 @@
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></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 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 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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 int_bound (range) parameter. 
 <p>
-<hr><h2>Member Typedef Documentation</h2>
-<a class="anchor" name="81e073b428b50247daba38531dcf412a"></a><!-- doxytag: member="stp_int_bound_t::lower" ref="81e073b428b50247daba38531dcf412a" args="" --><p>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_int_bound_t::lower" ref="o0" 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 int <a class="el" href="structstp__int__bound__t.html#81e073b428b50247daba38531dcf412a">stp_int_bound_t::lower</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__int__bound__t.html#o0">stp_int_bound_t::lower</a>          </td>
         </tr>
       </table>
     </td>
@@ -63,13 +48,13 @@ int_bound (range) parameter.
 Lower bound.     </td>
   </tr>
 </table>
-<a class="anchor" name="0122b4c2c01ee1c698ecc309d2b8eb5a"></a><!-- doxytag: member="stp_int_bound_t::upper" ref="0122b4c2c01ee1c698ecc309d2b8eb5a" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_int_bound_t::upper" ref="o1" 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 int <a class="el" href="structstp__int__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">stp_int_bound_t::upper</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__int__bound__t.html#o1">stp_int_bound_t::upper</a>          </td>
         </tr>
       </table>
     </td>
@@ -88,8 +73,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html
index b23a6d0..2b20501 100644
--- a/doc/gutenprint/html/structstp__lineactive__t.html
+++ b/doc/gutenprint/html/structstp__lineactive__t.html
@@ -2,42 +2,27 @@
 <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.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>
+<!-- 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>
 <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#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__lineactive__t.html#o0">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#9e3669d19b675bd57058fd4664205d2a">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#o1">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="7e65a932280df4e01f60294f031fb97e"></a><!-- doxytag: member="stp_lineactive_t::ncolors" ref="7e65a932280df4e01f60294f031fb97e" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_lineactive_t::ncolors" ref="o0" 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#7e65a932280df4e01f60294f031fb97e">stp_lineactive_t::ncolors</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__lineactive__t.html#o0">stp_lineactive_t::ncolors</a>          </td>
         </tr>
       </table>
     </td>
@@ -54,13 +39,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9e3669d19b675bd57058fd4664205d2a"></a><!-- doxytag: member="stp_lineactive_t::v" ref="9e3669d19b675bd57058fd4664205d2a" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_lineactive_t::v" ref="o1" 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#9e3669d19b675bd57058fd4664205d2a">stp_lineactive_t::v</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__lineactive__t.html#o1">stp_lineactive_t::v</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,8 +64,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html
index 778745a..5abb32a 100644
--- a/doc/gutenprint/html/structstp__linebounds__t.html
+++ b/doc/gutenprint/html/structstp__linebounds__t.html
@@ -2,44 +2,29 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#1f90fb291292e9a933aa6aac4a9c857e">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#o2">end_pos</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="1f90fb291292e9a933aa6aac4a9c857e"></a><!-- doxytag: member="stp_linebounds_t::end_pos" ref="1f90fb291292e9a933aa6aac4a9c857e" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_linebounds_t::end_pos" ref="o2" 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#1f90fb291292e9a933aa6aac4a9c857e">stp_linebounds_t::end_pos</a>          </td>
+          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linebounds__t.html#o2">stp_linebounds_t::end_pos</a>          </td>
         </tr>
       </table>
     </td>
@@ -56,13 +41,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="7e65a932280df4e01f60294f031fb97e"></a><!-- doxytag: member="stp_linebounds_t::ncolors" ref="7e65a932280df4e01f60294f031fb97e" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_linebounds_t::ncolors" ref="o0" 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#7e65a932280df4e01f60294f031fb97e">stp_linebounds_t::ncolors</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linebounds__t.html#o0">stp_linebounds_t::ncolors</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,13 +64,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="8fb0bcdadf14357992c7faea15fb9497"></a><!-- doxytag: member="stp_linebounds_t::start_pos" ref="8fb0bcdadf14357992c7faea15fb9497" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_linebounds_t::start_pos" ref="o1" 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#8fb0bcdadf14357992c7faea15fb9497">stp_linebounds_t::start_pos</a>          </td>
+          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linebounds__t.html#o1">stp_linebounds_t::start_pos</a>          </td>
         </tr>
       </table>
     </td>
@@ -104,8 +89,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html
index 0891576..3efe6c8 100644
--- a/doc/gutenprint/html/structstp__linebufs__t.html
+++ b/doc/gutenprint/html/structstp__linebufs__t.html
@@ -2,42 +2,27 @@
 <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.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>
+<!-- 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>
 <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#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__linebufs__t.html#o0">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#9e3669d19b675bd57058fd4664205d2a">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#o1">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="7e65a932280df4e01f60294f031fb97e"></a><!-- doxytag: member="stp_linebufs_t::ncolors" ref="7e65a932280df4e01f60294f031fb97e" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_linebufs_t::ncolors" ref="o0" 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#7e65a932280df4e01f60294f031fb97e">stp_linebufs_t::ncolors</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linebufs__t.html#o0">stp_linebufs_t::ncolors</a>          </td>
         </tr>
       </table>
     </td>
@@ -54,13 +39,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9e3669d19b675bd57058fd4664205d2a"></a><!-- doxytag: member="stp_linebufs_t::v" ref="9e3669d19b675bd57058fd4664205d2a" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_linebufs_t::v" ref="o1" 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#9e3669d19b675bd57058fd4664205d2a">stp_linebufs_t::v</a>          </td>
+          <td class="md" nowrap valign="top">unsigned char** <a class="el" href="structstp__linebufs__t.html#o1">stp_linebufs_t::v</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,8 +64,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html
index ce4b8fa..cecf414 100644
--- a/doc/gutenprint/html/structstp__linecount__t.html
+++ b/doc/gutenprint/html/structstp__linecount__t.html
@@ -2,42 +2,27 @@
 <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.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>
+<!-- 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>
 <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#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#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#9e3669d19b675bd57058fd4664205d2a">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#o1">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="7e65a932280df4e01f60294f031fb97e"></a><!-- doxytag: member="stp_linecount_t::ncolors" ref="7e65a932280df4e01f60294f031fb97e" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_linecount_t::ncolors" ref="o0" 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#7e65a932280df4e01f60294f031fb97e">stp_linecount_t::ncolors</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linecount__t.html#o0">stp_linecount_t::ncolors</a>          </td>
         </tr>
       </table>
     </td>
@@ -54,13 +39,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9e3669d19b675bd57058fd4664205d2a"></a><!-- doxytag: member="stp_linecount_t::v" ref="9e3669d19b675bd57058fd4664205d2a" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_linecount_t::v" ref="o1" 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#9e3669d19b675bd57058fd4664205d2a">stp_linecount_t::v</a>          </td>
+          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linecount__t.html#o1">stp_linecount_t::v</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,8 +64,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html
index 353fed2..7b7a832 100644
--- a/doc/gutenprint/html/structstp__lineoff__t.html
+++ b/doc/gutenprint/html/structstp__lineoff__t.html
@@ -2,42 +2,27 @@
 <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.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>
+<!-- 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>
 <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#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__lineoff__t.html#o0">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#9e3669d19b675bd57058fd4664205d2a">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#o1">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="7e65a932280df4e01f60294f031fb97e"></a><!-- doxytag: member="stp_lineoff_t::ncolors" ref="7e65a932280df4e01f60294f031fb97e" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_lineoff_t::ncolors" ref="o0" 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#7e65a932280df4e01f60294f031fb97e">stp_lineoff_t::ncolors</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__lineoff__t.html#o0">stp_lineoff_t::ncolors</a>          </td>
         </tr>
       </table>
     </td>
@@ -54,13 +39,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9e3669d19b675bd57058fd4664205d2a"></a><!-- doxytag: member="stp_lineoff_t::v" ref="9e3669d19b675bd57058fd4664205d2a" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_lineoff_t::v" ref="o1" 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#9e3669d19b675bd57058fd4664205d2a">stp_lineoff_t::v</a>          </td>
+          <td class="md" nowrap valign="top">unsigned long* <a class="el" href="structstp__lineoff__t.html#o1">stp_lineoff_t::v</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,8 +64,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module.html b/doc/gutenprint/html/structstp__module.html
index 2f5a996..61911f7 100644
--- a/doc/gutenprint/html/structstp__module.html
+++ b/doc/gutenprint/html/structstp__module.html
@@ -2,54 +2,39 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#06d4cd63bde972fc66a0aed41d2f5c51">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#o2">comment</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"><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">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">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">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#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#b5296150c31e6581161fc46595a06b78">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#o6">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#928a1fa51ea5f2eaae90429c74743ced">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#o7">syms</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="a2f2ed4f8ebc2cbb4c21a29dc40ab61d"></a><!-- doxytag: member="stp_module::class" ref="a2f2ed4f8ebc2cbb4c21a29dc40ab61d" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_module::class" ref="o3" 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#df2656b9a248237bdf28247c133a046d">stp_module_class_t</a> <a class="el" href="structstp__module.html#a2f2ed4f8ebc2cbb4c21a29dc40ab61d">stp_module::class</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -66,13 +51,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="06d4cd63bde972fc66a0aed41d2f5c51"></a><!-- doxytag: member="stp_module::comment" ref="06d4cd63bde972fc66a0aed41d2f5c51" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_module::comment" ref="o2" 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#06d4cd63bde972fc66a0aed41d2f5c51">stp_module::comment</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#o2">stp_module::comment</a>          </td>
         </tr>
       </table>
     </td>
@@ -89,13 +74,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b5296150c31e6581161fc46595a06b78"></a><!-- doxytag: member="stp_module::fini" ref="b5296150c31e6581161fc46595a06b78" args=")(void)" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="stp_module::fini" ref="o6" 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#b5296150c31e6581161fc46595a06b78">stp_module::fini</a>)(void)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__module.html#o6">stp_module::fini</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -112,13 +97,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="e1260894f59eeae98c8440899de4df8d"></a><!-- doxytag: member="stp_module::handle" ref="e1260894f59eeae98c8440899de4df8d" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_module::handle" ref="o4" 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#e1260894f59eeae98c8440899de4df8d">stp_module::handle</a>          </td>
+          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__module.html#o4">stp_module::handle</a>          </td>
         </tr>
       </table>
     </td>
@@ -135,13 +120,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="e410d3c31d3473619bad7812df075dd9"></a><!-- doxytag: member="stp_module::init" ref="e410d3c31d3473619bad7812df075dd9" args=")(void)" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="stp_module::init" ref="o5" 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#e410d3c31d3473619bad7812df075dd9">stp_module::init</a>)(void)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__module.html#o5">stp_module::init</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -158,13 +143,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_module::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_module::name" ref="o0" 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#b068931cc450442b63f5b3d276ea4297">stp_module::name</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#o0">stp_module::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -181,13 +166,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="928a1fa51ea5f2eaae90429c74743ced"></a><!-- doxytag: member="stp_module::syms" ref="928a1fa51ea5f2eaae90429c74743ced" args="" --><p>
+<a class="anchor" name="o7"></a><!-- doxytag: member="stp_module::syms" ref="o7" 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#928a1fa51ea5f2eaae90429c74743ced">stp_module::syms</a>          </td>
+          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__module.html#o7">stp_module::syms</a>          </td>
         </tr>
       </table>
     </td>
@@ -204,13 +189,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2af72f100c356273d46284f6fd1dfc08"></a><!-- doxytag: member="stp_module::version" ref="2af72f100c356273d46284f6fd1dfc08" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_module::version" ref="o1" 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#2af72f100c356273d46284f6fd1dfc08">stp_module::version</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#o1">stp_module::version</a>          </td>
         </tr>
       </table>
     </td>
@@ -229,8 +214,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version.html
index 68379a6..c23f3ab 100644
--- a/doc/gutenprint/html/structstp__module__version.html
+++ b/doc/gutenprint/html/structstp__module__version.html
@@ -2,42 +2,27 @@
 <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.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>
+<!-- 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>
 <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#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#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#ab846c0e3717a3e7d14af45cab70b44a">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#o1">minor</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="f1425da40a9f2d21ab702a1c7feae026"></a><!-- doxytag: member="stp_module_version::major" ref="f1425da40a9f2d21ab702a1c7feae026" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_module_version::major" ref="o0" 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#f1425da40a9f2d21ab702a1c7feae026">stp_module_version::major</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__module__version.html#o0">stp_module_version::major</a>          </td>
         </tr>
       </table>
     </td>
@@ -54,13 +39,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="ab846c0e3717a3e7d14af45cab70b44a"></a><!-- doxytag: member="stp_module_version::minor" ref="ab846c0e3717a3e7d14af45cab70b44a" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_module_version::minor" ref="o1" 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#ab846c0e3717a3e7d14af45cab70b44a">stp_module_version::minor</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__module__version.html#o1">stp_module_version::minor</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,8 +64,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 9686548..979521b 100644
--- a/doc/gutenprint/html/structstp__mxml__attr__s.html
+++ b/doc/gutenprint/html/structstp__mxml__attr__s.html
@@ -2,42 +2,27 @@
 <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.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>
+<!-- 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>
 <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#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#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#2063c1608d6e0baf80249c42e2be5804">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#o1">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_mxml_attr_s::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_attr_s::name" ref="o0" 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#b068931cc450442b63f5b3d276ea4297">stp_mxml_attr_s::name</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__attr__s.html#o0">stp_mxml_attr_s::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -54,13 +39,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2063c1608d6e0baf80249c42e2be5804"></a><!-- doxytag: member="stp_mxml_attr_s::value" ref="2063c1608d6e0baf80249c42e2be5804" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_attr_s::value" ref="o1" 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#2063c1608d6e0baf80249c42e2be5804">stp_mxml_attr_s::value</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__attr__s.html#o1">stp_mxml_attr_s::value</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,8 +64,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 afb2a32..6f8bc86 100644
--- a/doc/gutenprint/html/structstp__mxml__node__s.html
+++ b/doc/gutenprint/html/structstp__mxml__node__s.html
@@ -2,52 +2,37 @@
 <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.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>
+<!-- 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>
 <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#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="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="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#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#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#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#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#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#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#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#683657fb65ef37f597bddef3847a3eff">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#o5">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#2063c1608d6e0baf80249c42e2be5804">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#o6">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="1b7d5726533ab525a8760351e9b5e415"></a><!-- doxytag: member="stp_mxml_node_s::child" ref="1b7d5726533ab525a8760351e9b5e415" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_mxml_node_s::child" ref="o4" 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#1b7d5726533ab525a8760351e9b5e415">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#o4">stp_mxml_node_s::child</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,13 +49,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="683657fb65ef37f597bddef3847a3eff"></a><!-- doxytag: member="stp_mxml_node_s::last_child" ref="683657fb65ef37f597bddef3847a3eff" args="" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="stp_mxml_node_s::last_child" ref="o5" 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#683657fb65ef37f597bddef3847a3eff">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#o5">stp_mxml_node_s::last_child</a>          </td>
         </tr>
       </table>
     </td>
@@ -87,13 +72,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="d0cab90d8d20d57e2f2b9be52f7dd25d"></a><!-- doxytag: member="stp_mxml_node_s::next" ref="d0cab90d8d20d57e2f2b9be52f7dd25d" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_node_s::next" ref="o1" 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#d0cab90d8d20d57e2f2b9be52f7dd25d">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#o1">stp_mxml_node_s::next</a>          </td>
         </tr>
       </table>
     </td>
@@ -110,13 +95,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="d0e45878043844ffc41aac437e86b602"></a><!-- doxytag: member="stp_mxml_node_s::parent" ref="d0e45878043844ffc41aac437e86b602" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_mxml_node_s::parent" ref="o3" 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#d0e45878043844ffc41aac437e86b602">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#o3">stp_mxml_node_s::parent</a>          </td>
         </tr>
       </table>
     </td>
@@ -133,13 +118,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="fcb08b164ac83e09964deb24f2d2e80b"></a><!-- doxytag: member="stp_mxml_node_s::prev" ref="fcb08b164ac83e09964deb24f2d2e80b" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_mxml_node_s::prev" ref="o2" 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#fcb08b164ac83e09964deb24f2d2e80b">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#o2">stp_mxml_node_s::prev</a>          </td>
         </tr>
       </table>
     </td>
@@ -156,13 +141,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="599dcce2998a6b40b1e38e8c6006cb0a"></a><!-- doxytag: member="stp_mxml_node_s::type" ref="599dcce2998a6b40b1e38e8c6006cb0a" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_node_s::type" ref="o0" 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#1ed6fadf477121e16a83bc1899c30d5c">stp_mxml_type_t</a> <a class="el" href="structstp__mxml__node__s.html#599dcce2998a6b40b1e38e8c6006cb0a">stp_mxml_node_s::type</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -179,13 +164,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2063c1608d6e0baf80249c42e2be5804"></a><!-- doxytag: member="stp_mxml_node_s::value" ref="2063c1608d6e0baf80249c42e2be5804" args="" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="stp_mxml_node_s::value" ref="o6" 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#2063c1608d6e0baf80249c42e2be5804">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#o6">stp_mxml_node_s::value</a>          </td>
         </tr>
       </table>
     </td>
@@ -204,8 +189,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 8b23c53..528d820 100644
--- a/doc/gutenprint/html/structstp__mxml__text__s.html
+++ b/doc/gutenprint/html/structstp__mxml__text__s.html
@@ -2,42 +2,27 @@
 <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.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>
+<!-- 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>
 <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#67b8601a11e47a9ee3bf08ddfd0b79ba">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#o0">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#b45cffe084dd3d20d928bee85e7b0f21">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#o1">string</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="b45cffe084dd3d20d928bee85e7b0f21"></a><!-- doxytag: member="stp_mxml_text_s::string" ref="b45cffe084dd3d20d928bee85e7b0f21" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_text_s::string" ref="o1" 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#b45cffe084dd3d20d928bee85e7b0f21">stp_mxml_text_s::string</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__text__s.html#o1">stp_mxml_text_s::string</a>          </td>
         </tr>
       </table>
     </td>
@@ -54,13 +39,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="67b8601a11e47a9ee3bf08ddfd0b79ba"></a><!-- doxytag: member="stp_mxml_text_s::whitespace" ref="67b8601a11e47a9ee3bf08ddfd0b79ba" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_text_s::whitespace" ref="o0" 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#67b8601a11e47a9ee3bf08ddfd0b79ba">stp_mxml_text_s::whitespace</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__mxml__text__s.html#o0">stp_mxml_text_s::whitespace</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,8 +64,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 df0857f..1dcc51f 100644
--- a/doc/gutenprint/html/structstp__mxml__value__s.html
+++ b/doc/gutenprint/html/structstp__mxml__value__s.html
@@ -2,44 +2,29 @@
 <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.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>
+<!-- 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>
 <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#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__value__s.html#o0">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#30f1579a824317cbe2b6837454cd0ef1">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#o1">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#425ce871530e0633c917f98d8e9b1bc7">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>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="425ce871530e0633c917f98d8e9b1bc7"></a><!-- doxytag: member="stp_mxml_value_s::attrs" ref="425ce871530e0633c917f98d8e9b1bc7" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_mxml_value_s::attrs" ref="o2" 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#425ce871530e0633c917f98d8e9b1bc7">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#o2">stp_mxml_value_s::attrs</a>          </td>
         </tr>
       </table>
     </td>
@@ -56,13 +41,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_mxml_value_s::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_value_s::name" ref="o0" 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#b068931cc450442b63f5b3d276ea4297">stp_mxml_value_s::name</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__value__s.html#o0">stp_mxml_value_s::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,13 +64,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="30f1579a824317cbe2b6837454cd0ef1"></a><!-- doxytag: member="stp_mxml_value_s::num_attrs" ref="30f1579a824317cbe2b6837454cd0ef1" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_value_s::num_attrs" ref="o1" 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#30f1579a824317cbe2b6837454cd0ef1">stp_mxml_value_s::num_attrs</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -104,8 +89,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html
index 6cc253d..46fbb58 100644
--- a/doc/gutenprint/html/structstp__papersize__t.html
+++ b/doc/gutenprint/html/structstp__papersize__t.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_papersize_t Struct Reference<br>
 <small>
 [<a class="el" href="group__papersize.html">papersize</a>]</small>
@@ -31,48 +16,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#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__papersize__t.html#o0">name</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">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">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">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">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">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">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 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 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">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">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">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">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">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">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">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">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">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">Units of measurement.  <a href="#00a9745ae8b0126b5763ba88daba837b"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="#o9"></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="71f262d796bed1ab30e8a2d5a8ddee6f"></a><!-- doxytag: member="stp_papersize_t::bottom" ref="71f262d796bed1ab30e8a2d5a8ddee6f" args="" --><p>
+<a class="anchor" name="o7"></a><!-- doxytag: member="stp_papersize_t::bottom" ref="o7" 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#71f262d796bed1ab30e8a2d5a8ddee6f">stp_papersize_t::bottom</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o7">stp_papersize_t::bottom</a>          </td>
         </tr>
       </table>
     </td>
@@ -91,13 +76,13 @@ Bottom margin.
     </td>
   </tr>
 </table>
-<a class="anchor" name="06d4cd63bde972fc66a0aed41d2f5c51"></a><!-- doxytag: member="stp_papersize_t::comment" ref="06d4cd63bde972fc66a0aed41d2f5c51" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_papersize_t::comment" ref="o2" 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#06d4cd63bde972fc66a0aed41d2f5c51">stp_papersize_t::comment</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#o2">stp_papersize_t::comment</a>          </td>
         </tr>
       </table>
     </td>
@@ -116,13 +101,13 @@ Comment.
     </td>
   </tr>
 </table>
-<a class="anchor" name="b435e227d5dd201e1768b2bcb2e0aa81"></a><!-- doxytag: member="stp_papersize_t::height" ref="b435e227d5dd201e1768b2bcb2e0aa81" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_papersize_t::height" ref="o4" 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#b435e227d5dd201e1768b2bcb2e0aa81">stp_papersize_t::height</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o4">stp_papersize_t::height</a>          </td>
         </tr>
       </table>
     </td>
@@ -141,13 +126,13 @@ Paper height.
     </td>
   </tr>
 </table>
-<a class="anchor" name="811882fecd5c7618d7099ebbd39ea254"></a><!-- doxytag: member="stp_papersize_t::left" ref="811882fecd5c7618d7099ebbd39ea254" args="" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="stp_papersize_t::left" ref="o6" 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#811882fecd5c7618d7099ebbd39ea254">stp_papersize_t::left</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o6">stp_papersize_t::left</a>          </td>
         </tr>
       </table>
     </td>
@@ -166,13 +151,13 @@ Left margin.
     </td>
   </tr>
 </table>
-<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_papersize_t::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_papersize_t::name" ref="o0" 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#b068931cc450442b63f5b3d276ea4297">stp_papersize_t::name</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#o0">stp_papersize_t::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -191,13 +176,13 @@ Short unique name (not translated).
     </td>
   </tr>
 </table>
-<a class="anchor" name="00a9745ae8b0126b5763ba88daba837b"></a><!-- doxytag: member="stp_papersize_t::paper_unit" ref="00a9745ae8b0126b5763ba88daba837b" args="" --><p>
+<a class="anchor" name="o9"></a><!-- doxytag: member="stp_papersize_t::paper_unit" ref="o9" 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#gbb66a8f6ce85d70afd9fe42472b492d8">stp_papersize_unit_t</a> <a class="el" href="structstp__papersize__t.html#00a9745ae8b0126b5763ba88daba837b">stp_papersize_t::paper_unit</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -216,13 +201,13 @@ Units of measurement.
     </td>
   </tr>
 </table>
-<a class="anchor" name="7c4f29407893c334a6cb7a87bf045c0d"></a><!-- doxytag: member="stp_papersize_t::right" ref="7c4f29407893c334a6cb7a87bf045c0d" args="" --><p>
+<a class="anchor" name="o8"></a><!-- doxytag: member="stp_papersize_t::right" ref="o8" 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#7c4f29407893c334a6cb7a87bf045c0d">stp_papersize_t::right</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o8">stp_papersize_t::right</a>          </td>
         </tr>
       </table>
     </td>
@@ -241,13 +226,13 @@ Right margin.
     </td>
   </tr>
 </table>
-<a class="anchor" name="1cb251ec0d568de6a929b520c4aed8d1"></a><!-- doxytag: member="stp_papersize_t::text" ref="1cb251ec0d568de6a929b520c4aed8d1" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_papersize_t::text" ref="o1" 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#1cb251ec0d568de6a929b520c4aed8d1">stp_papersize_t::text</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#o1">stp_papersize_t::text</a>          </td>
         </tr>
       </table>
     </td>
@@ -266,13 +251,13 @@ Long descriptive name (translated).
     </td>
   </tr>
 </table>
-<a class="anchor" name="b28354b543375bfa94dabaeda722927f"></a><!-- doxytag: member="stp_papersize_t::top" ref="b28354b543375bfa94dabaeda722927f" args="" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="stp_papersize_t::top" ref="o5" 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#b28354b543375bfa94dabaeda722927f">stp_papersize_t::top</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o5">stp_papersize_t::top</a>          </td>
         </tr>
       </table>
     </td>
@@ -291,13 +276,13 @@ Top margin.
     </td>
   </tr>
 </table>
-<a class="anchor" name="eaae26a6fb20ed3ef54fb23bfa0b1fcc"></a><!-- doxytag: member="stp_papersize_t::width" ref="eaae26a6fb20ed3ef54fb23bfa0b1fcc" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_papersize_t::width" ref="o3" 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#eaae26a6fb20ed3ef54fb23bfa0b1fcc">stp_papersize_t::width</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o3">stp_papersize_t::width</a>          </td>
         </tr>
       </table>
     </td>
@@ -318,8 +303,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </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 a47c363..6e09bdd 100644
--- a/doc/gutenprint/html/structstp__param__string__t.html
+++ b/doc/gutenprint/html/structstp__param__string__t.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_param_string_t Struct Reference</h1><!-- doxytag: class="stp_param_string_t" -->String parameter.  
 <a href="#_details">More...</a>
 <p>
@@ -28,24 +13,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#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#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#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__param__string__t.html#o1">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="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_param_string_t::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_param_string_t::name" ref="o0" 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#b068931cc450442b63f5b3d276ea4297">stp_param_string_t::name</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -62,13 +47,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="1cb251ec0d568de6a929b520c4aed8d1"></a><!-- doxytag: member="stp_param_string_t::text" ref="1cb251ec0d568de6a929b520c4aed8d1" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_param_string_t::text" ref="o1" 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#1cb251ec0d568de6a929b520c4aed8d1">stp_param_string_t::text</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -87,8 +72,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html
index b8a226a..18b6491 100644
--- a/doc/gutenprint/html/structstp__parameter__t.html
+++ b/doc/gutenprint/html/structstp__parameter__t.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_parameter_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -30,78 +15,77 @@
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></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 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 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#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#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#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#657f8b8da628ef83cf69101b6817150a">help</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 <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#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#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#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#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"><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 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#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#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#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#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#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#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#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#befe72871b2de8f4f0e20108517e31fe">read_only</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 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#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="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="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__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__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#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#c4cf4802b30127a6ae42a1a1798c51b3">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#o15">dimension</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="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="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>&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 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 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>union {</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="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;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;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;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#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#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#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#84e2c64f38f78ba3ea5c905ab5a2da27">boolean</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;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;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;<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>&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 valign="top">}&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#1ae03ed771e3171fae03ed917b22ceff">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#o26">deflt</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Parameter description. 
 <p>
-<hr><h2>Member Typedef Documentation</h2>
-<a class="anchor" name="c4ef352f74e502ef5e7bc98e6f4e493d"></a><!-- doxytag: member="stp_parameter_t::category" ref="c4ef352f74e502ef5e7bc98e6f4e493d" args="" --><p>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="o25"></a><!-- doxytag: member="stp_parameter_t::array" ref="o25" 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 char* <a class="el" href="structstp__parameter__t.html#c4ef352f74e502ef5e7bc98e6f4e493d">stp_parameter_t::category</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -115,16 +99,16 @@ Parameter description.
     <td>
 
 <p>
-User-visible category name.     </td>
+Default array parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="c485d2ed5cc4ce64fcccca710c7a0bb7"></a><!-- doxytag: member="stp_parameter_t::channel" ref="c485d2ed5cc4ce64fcccca710c7a0bb7" args="" --><p>
+<a class="anchor" name="o17"></a><!-- doxytag: member="stp_parameter_t::array" ref="o17" 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 unsigned char <a class="el" href="structstp__parameter__t.html#c485d2ed5cc4ce64fcccca710c7a0bb7">stp_parameter_t::channel</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -138,16 +122,16 @@ User-visible category name.     </td>
     <td>
 
 <p>
-The channel to which this parameter applies     </td>
+array parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="657f8b8da628ef83cf69101b6817150a"></a><!-- doxytag: member="stp_parameter_t::help" ref="657f8b8da628ef83cf69101b6817150a" args="" --><p>
+<a class="anchor" name="o23"></a><!-- doxytag: member="stp_parameter_t::boolean" ref="o23" 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 char* <a class="el" href="structstp__parameter__t.html#657f8b8da628ef83cf69101b6817150a">stp_parameter_t::help</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#o23">stp_parameter_t::boolean</a>          </td>
         </tr>
       </table>
     </td>
@@ -161,16 +145,16 @@ The channel to which this parameter applies     </td>
     <td>
 
 <p>
-Help string.     </td>
+Default boolean parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="4264c638e0098acb172519b0436db099"></a><!-- doxytag: member="stp_parameter_t::is_active" ref="4264c638e0098acb172519b0436db099" args="" --><p>
+<a class="anchor" name="o18"></a><!-- doxytag: member="stp_parameter_t::bounds" ref="o18" 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 unsigned char <a class="el" href="structstp__parameter__t.html#4264c638e0098acb172519b0436db099">stp_parameter_t::is_active</a>          </td>
+          <td class="md" nowrap valign="top">union { ... }   <a class="el" href="structstp__parameter__t.html#o18">stp_parameter_t::bounds</a>          </td>
         </tr>
       </table>
     </td>
@@ -184,16 +168,16 @@ Help string.     </td>
     <td>
 
 <p>
-Is the parameter active?     </td>
+Limits on the values the parameter may take.     </td>
   </tr>
 </table>
-<a class="anchor" name="c261f1bf67a23fb36eadbb2c644c162f"></a><!-- doxytag: member="stp_parameter_t::is_mandatory" ref="c261f1bf67a23fb36eadbb2c644c162f" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_parameter_t::category" ref="o2" 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 unsigned char <a class="el" href="structstp__parameter__t.html#c261f1bf67a23fb36eadbb2c644c162f">stp_parameter_t::is_mandatory</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o2">stp_parameter_t::category</a>          </td>
         </tr>
       </table>
     </td>
@@ -207,16 +191,16 @@ Is the parameter active?     </td>
     <td>
 
 <p>
-The parameter is required, even when set inactive.     </td>
+User-visible category name.     </td>
   </tr>
 </table>
-<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_parameter_t::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
+<a class="anchor" name="o9"></a><!-- doxytag: member="stp_parameter_t::channel" ref="o9" 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 char* <a class="el" href="structstp__parameter__t.html#b068931cc450442b63f5b3d276ea4297">stp_parameter_t::name</a>          </td>
+          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o9">stp_parameter_t::channel</a>          </td>
         </tr>
       </table>
     </td>
@@ -230,16 +214,16 @@ The parameter is required, even when set inactive.     </td>
     <td>
 
 <p>
-Internal name (key).     </td>
+The channel to which this parameter applies     </td>
   </tr>
 </table>
-<a class="anchor" name="8112bb5792909f9417d1f6d2ab36863a"></a><!-- doxytag: member="stp_parameter_t::p_class" ref="8112bb5792909f9417d1f6d2ab36863a" args="" --><p>
+<a class="anchor" name="o19"></a><!-- doxytag: member="stp_parameter_t::curve" ref="o19" 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 <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>
+          <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>
         </tr>
       </table>
     </td>
@@ -253,16 +237,16 @@ Internal name (key).     </td>
     <td>
 
 <p>
-Parameter class.     </td>
+Default curve parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="c52b547d5a185fa1e792e175f90d24fc"></a><!-- doxytag: member="stp_parameter_t::p_level" ref="c52b547d5a185fa1e792e175f90d24fc" args="" --><p>
+<a class="anchor" name="o12"></a><!-- doxytag: member="stp_parameter_t::curve" ref="o12" 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 <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>
+          <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>
         </tr>
       </table>
     </td>
@@ -276,16 +260,16 @@ Parameter class.     </td>
     <td>
 
 <p>
-Parameter level.     </td>
+curve parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="ee532d298de9538e682d9a1eaea12378"></a><!-- doxytag: member="stp_parameter_t::p_type" ref="ee532d298de9538e682d9a1eaea12378" args="" --><p>
+<a class="anchor" name="o20"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="o20" 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 <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>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__parameter__t.html#o13">stp_parameter_t::dbl</a>          </td>
         </tr>
       </table>
     </td>
@@ -299,16 +283,16 @@ Parameter level.     </td>
     <td>
 
 <p>
-Parameter type.     </td>
+Default double parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="befe72871b2de8f4f0e20108517e31fe"></a><!-- doxytag: member="stp_parameter_t::read_only" ref="befe72871b2de8f4f0e20108517e31fe" args="" --><p>
+<a class="anchor" name="o13"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="o13" 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 unsigned char <a class="el" href="structstp__parameter__t.html#befe72871b2de8f4f0e20108517e31fe">stp_parameter_t::read_only</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#o13">stp_parameter_t::dbl</a>          </td>
         </tr>
       </table>
     </td>
@@ -322,16 +306,16 @@ Parameter type.     </td>
     <td>
 
 <p>
-    </td>
+double_bound parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="1cb251ec0d568de6a929b520c4aed8d1"></a><!-- doxytag: member="stp_parameter_t::text" ref="1cb251ec0d568de6a929b520c4aed8d1" args="" --><p>
+<a class="anchor" name="o26"></a><!-- doxytag: member="stp_parameter_t::deflt" ref="o26" 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 char* <a class="el" href="structstp__parameter__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_parameter_t::text</a>          </td>
+          <td class="md" nowrap valign="top">union { ... }   <a class="el" href="structstp__parameter__t.html#o26">stp_parameter_t::deflt</a>          </td>
         </tr>
       </table>
     </td>
@@ -345,16 +329,16 @@ Parameter type.     </td>
     <td>
 
 <p>
-User-visible name.     </td>
+Default value of the parameter.     </td>
   </tr>
 </table>
-<a class="anchor" name="f07c856ac0ac425e65f87fff7a12b34d"></a><!-- doxytag: member="stp_parameter_t::verify_this_parameter" ref="f07c856ac0ac425e65f87fff7a12b34d" args="" --><p>
+<a class="anchor" name="o21"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="o21" 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 unsigned char <a class="el" href="structstp__parameter__t.html#f07c856ac0ac425e65f87fff7a12b34d">stp_parameter_t::verify_this_parameter</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#o15">stp_parameter_t::dimension</a>          </td>
         </tr>
       </table>
     </td>
@@ -368,17 +352,16 @@ User-visible name.     </td>
     <td>
 
 <p>
-Should the verify system check this parameter?     </td>
+Default dimension parameter value.     </td>
   </tr>
 </table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="f1f713c9e000f5d3f280adbd124df4f5"></a><!-- doxytag: member="stp_parameter_t::array" ref="f1f713c9e000f5d3f280adbd124df4f5" args="" --><p>
+<a class="anchor" name="o15"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="o15" 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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#f1f713c9e000f5d3f280adbd124df4f5">stp_parameter_t::array</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#o15">stp_parameter_t::dimension</a>          </td>
         </tr>
       </table>
     </td>
@@ -392,16 +375,16 @@ Should the verify system check this parameter?     </td>
     <td>
 
 <p>
-Default array parameter value.     </td>
+int_bound parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="f1f713c9e000f5d3f280adbd124df4f5"></a><!-- doxytag: member="stp_parameter_t::array" ref="f1f713c9e000f5d3f280adbd124df4f5" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_parameter_t::help" ref="o3" 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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#f1f713c9e000f5d3f280adbd124df4f5">stp_parameter_t::array</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o3">stp_parameter_t::help</a>          </td>
         </tr>
       </table>
     </td>
@@ -415,16 +398,16 @@ Default array parameter value.     </td>
     <td>
 
 <p>
-array parameter value.     </td>
+Help string.     </td>
   </tr>
 </table>
-<a class="anchor" name="84e2c64f38f78ba3ea5c905ab5a2da27"></a><!-- doxytag: member="stp_parameter_t::boolean" ref="84e2c64f38f78ba3ea5c905ab5a2da27" args="" --><p>
+<a class="anchor" name="o22"></a><!-- doxytag: member="stp_parameter_t::integer" ref="o22" 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#84e2c64f38f78ba3ea5c905ab5a2da27">stp_parameter_t::boolean</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#o14">stp_parameter_t::integer</a>          </td>
         </tr>
       </table>
     </td>
@@ -438,16 +421,16 @@ array parameter value.     </td>
     <td>
 
 <p>
-Default boolean parameter value.     </td>
+Default int parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="eb49194cccc646fc8e93a368301834ea"></a><!-- doxytag: member="stp_parameter_t::bounds" ref="eb49194cccc646fc8e93a368301834ea" args="" --><p>
+<a class="anchor" name="o14"></a><!-- doxytag: member="stp_parameter_t::integer" ref="o14" 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#eb49194cccc646fc8e93a368301834ea">stp_parameter_t::bounds</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#o14">stp_parameter_t::integer</a>          </td>
         </tr>
       </table>
     </td>
@@ -461,16 +444,16 @@ Default boolean parameter value.     </td>
     <td>
 
 <p>
-Limits on the values the parameter may take.     </td>
+int_bound parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="4efa264f5ef3e1a5c95736e07544ebf0"></a><!-- doxytag: member="stp_parameter_t::curve" ref="4efa264f5ef3e1a5c95736e07544ebf0" args="" --><p>
+<a class="anchor" name="o8"></a><!-- doxytag: member="stp_parameter_t::is_active" ref="o8" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#4efa264f5ef3e1a5c95736e07544ebf0">stp_parameter_t::curve</a>          </td>
+          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o8">stp_parameter_t::is_active</a>          </td>
         </tr>
       </table>
     </td>
@@ -484,16 +467,16 @@ Limits on the values the parameter may take.     </td>
     <td>
 
 <p>
-Default curve parameter value.     </td>
+Is the parameter active?     </td>
   </tr>
 </table>
-<a class="anchor" name="4efa264f5ef3e1a5c95736e07544ebf0"></a><!-- doxytag: member="stp_parameter_t::curve" ref="4efa264f5ef3e1a5c95736e07544ebf0" args="" --><p>
+<a class="anchor" name="o7"></a><!-- doxytag: member="stp_parameter_t::is_mandatory" ref="o7" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#4efa264f5ef3e1a5c95736e07544ebf0">stp_parameter_t::curve</a>          </td>
+          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o7">stp_parameter_t::is_mandatory</a>          </td>
         </tr>
       </table>
     </td>
@@ -507,16 +490,16 @@ Default curve parameter value.     </td>
     <td>
 
 <p>
-curve parameter value.     </td>
+The parameter is required, even when set inactive.     </td>
   </tr>
 </table>
-<a class="anchor" name="365b8373d0bf6dc9e3450af670cc1d35"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="365b8373d0bf6dc9e3450af670cc1d35" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_parameter_t::name" ref="o0" 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#365b8373d0bf6dc9e3450af670cc1d35">stp_parameter_t::dbl</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o0">stp_parameter_t::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -530,16 +513,16 @@ curve parameter value.     </td>
     <td>
 
 <p>
-Default double parameter value.     </td>
+Internal name (key).     </td>
   </tr>
 </table>
-<a class="anchor" name="365b8373d0bf6dc9e3450af670cc1d35"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="365b8373d0bf6dc9e3450af670cc1d35" args="" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="stp_parameter_t::p_class" ref="o5" 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#365b8373d0bf6dc9e3450af670cc1d35">stp_parameter_t::dbl</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -553,16 +536,16 @@ Default double parameter value.     </td>
     <td>
 
 <p>
-double_bound parameter value.     </td>
+Parameter class.     </td>
   </tr>
 </table>
-<a class="anchor" name="1ae03ed771e3171fae03ed917b22ceff"></a><!-- doxytag: member="stp_parameter_t::deflt" ref="1ae03ed771e3171fae03ed917b22ceff" args="" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="stp_parameter_t::p_level" ref="o6" 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#1ae03ed771e3171fae03ed917b22ceff">stp_parameter_t::deflt</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -576,16 +559,16 @@ double_bound parameter value.     </td>
     <td>
 
 <p>
-Default value of the parameter.     </td>
+Parameter level.     </td>
   </tr>
 </table>
-<a class="anchor" name="c4cf4802b30127a6ae42a1a1798c51b3"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="c4cf4802b30127a6ae42a1a1798c51b3" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_parameter_t::p_type" ref="o4" 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#c4cf4802b30127a6ae42a1a1798c51b3">stp_parameter_t::dimension</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -599,16 +582,16 @@ Default value of the parameter.     </td>
     <td>
 
 <p>
-Default dimension parameter value.     </td>
+Parameter type.     </td>
   </tr>
 </table>
-<a class="anchor" name="c4cf4802b30127a6ae42a1a1798c51b3"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="c4cf4802b30127a6ae42a1a1798c51b3" args="" --><p>
+<a class="anchor" name="o11"></a><!-- doxytag: member="stp_parameter_t::read_only" ref="o11" 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#c4cf4802b30127a6ae42a1a1798c51b3">stp_parameter_t::dimension</a>          </td>
+          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o11">stp_parameter_t::read_only</a>          </td>
         </tr>
       </table>
     </td>
@@ -622,16 +605,16 @@ Default dimension parameter value.     </td>
     <td>
 
 <p>
-int_bound parameter value.     </td>
+    </td>
   </tr>
 </table>
-<a class="anchor" name="157db7df530023575515d366c9b672e8"></a><!-- doxytag: member="stp_parameter_t::integer" ref="157db7df530023575515d366c9b672e8" args="" --><p>
+<a class="anchor" name="o24"></a><!-- doxytag: member="stp_parameter_t::str" ref="o24" 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#157db7df530023575515d366c9b672e8">stp_parameter_t::integer</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o16">stp_parameter_t::str</a>          </td>
         </tr>
       </table>
     </td>
@@ -645,16 +628,16 @@ int_bound parameter value.     </td>
     <td>
 
 <p>
-Default int parameter value.     </td>
+Default string parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="157db7df530023575515d366c9b672e8"></a><!-- doxytag: member="stp_parameter_t::integer" ref="157db7df530023575515d366c9b672e8" args="" --><p>
+<a class="anchor" name="o16"></a><!-- doxytag: member="stp_parameter_t::str" ref="o16" 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#157db7df530023575515d366c9b672e8">stp_parameter_t::integer</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -668,16 +651,16 @@ Default int parameter value.     </td>
     <td>
 
 <p>
-int_bound parameter value.     </td>
+string_list parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="341be97d9aff90c9978347f66f945b77"></a><!-- doxytag: member="stp_parameter_t::str" ref="341be97d9aff90c9978347f66f945b77" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_parameter_t::text" ref="o1" 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#341be97d9aff90c9978347f66f945b77">stp_parameter_t::str</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o1">stp_parameter_t::text</a>          </td>
         </tr>
       </table>
     </td>
@@ -691,16 +674,16 @@ int_bound parameter value.     </td>
     <td>
 
 <p>
-Default string parameter value.     </td>
+User-visible name.     </td>
   </tr>
 </table>
-<a class="anchor" name="341be97d9aff90c9978347f66f945b77"></a><!-- doxytag: member="stp_parameter_t::str" ref="341be97d9aff90c9978347f66f945b77" args="" --><p>
+<a class="anchor" name="o10"></a><!-- doxytag: member="stp_parameter_t::verify_this_parameter" ref="o10" 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#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a>* <a class="el" href="structstp__parameter__t.html#341be97d9aff90c9978347f66f945b77">stp_parameter_t::str</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -714,13 +697,13 @@ Default string parameter value.     </td>
     <td>
 
 <p>
-string_list parameter value.     </td>
+Should the verify system check this parameter?     </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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html
index 602574c..75d2a76 100644
--- a/doc/gutenprint/html/structstp__pass__t.html
+++ b/doc/gutenprint/html/structstp__pass__t.html
@@ -2,50 +2,35 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#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#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#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#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#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#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#769ff675e6c6adb86faf4316c1aa0ba3">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#o5">subpass</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="da94ad894675e9119f2c647a94e21605"></a><!-- doxytag: member="stp_pass_t::logicalpassstart" ref="da94ad894675e9119f2c647a94e21605" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_pass_t::logicalpassstart" ref="o2" 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#da94ad894675e9119f2c647a94e21605">stp_pass_t::logicalpassstart</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o2">stp_pass_t::logicalpassstart</a>          </td>
         </tr>
       </table>
     </td>
@@ -62,13 +47,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="6b75dc88fe75f396206e0c5862d61543"></a><!-- doxytag: member="stp_pass_t::missingstartrows" ref="6b75dc88fe75f396206e0c5862d61543" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_pass_t::missingstartrows" ref="o1" 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#6b75dc88fe75f396206e0c5862d61543">stp_pass_t::missingstartrows</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o1">stp_pass_t::missingstartrows</a>          </td>
         </tr>
       </table>
     </td>
@@ -85,13 +70,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="1a1dc91c907325c69271ddf0c944bc72"></a><!-- doxytag: member="stp_pass_t::pass" ref="1a1dc91c907325c69271ddf0c944bc72" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_pass_t::pass" ref="o0" 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#1a1dc91c907325c69271ddf0c944bc72">stp_pass_t::pass</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o0">stp_pass_t::pass</a>          </td>
         </tr>
       </table>
     </td>
@@ -108,13 +93,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="102875318f07394cc762ba839e0b5231"></a><!-- doxytag: member="stp_pass_t::physpassend" ref="102875318f07394cc762ba839e0b5231" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_pass_t::physpassend" ref="o4" 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#102875318f07394cc762ba839e0b5231">stp_pass_t::physpassend</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o4">stp_pass_t::physpassend</a>          </td>
         </tr>
       </table>
     </td>
@@ -131,13 +116,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="13436ac9693968e5601e30fd01451a02"></a><!-- doxytag: member="stp_pass_t::physpassstart" ref="13436ac9693968e5601e30fd01451a02" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_pass_t::physpassstart" ref="o3" 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#13436ac9693968e5601e30fd01451a02">stp_pass_t::physpassstart</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o3">stp_pass_t::physpassstart</a>          </td>
         </tr>
       </table>
     </td>
@@ -154,13 +139,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="769ff675e6c6adb86faf4316c1aa0ba3"></a><!-- doxytag: member="stp_pass_t::subpass" ref="769ff675e6c6adb86faf4316c1aa0ba3" args="" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="stp_pass_t::subpass" ref="o5" 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#769ff675e6c6adb86faf4316c1aa0ba3">stp_pass_t::subpass</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o5">stp_pass_t::subpass</a>          </td>
         </tr>
       </table>
     </td>
@@ -179,8 +164,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html
index 371b800..b2c58e4 100644
--- a/doc/gutenprint/html/structstp__printfuncs__t.html
+++ b/doc/gutenprint/html/structstp__printfuncs__t.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_printfuncs_t Struct Reference<br>
 <small>
 [<a class="el" href="group__printer.html">printer</a>]</small>
@@ -28,37 +13,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#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"><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">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#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#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#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#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#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#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">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">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">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">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">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">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">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">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#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#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#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#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>
+<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>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="92224ef5b74a148faa0459a1ff6edd6c"></a><!-- doxytag: member="stp_printfuncs_t::describe_output" ref="92224ef5b74a148faa0459a1ff6edd6c" args=")(const stp_vars_t *v)" --><p>
+<a class="anchor" name="o7"></a><!-- doxytag: member="stp_printfuncs_t::describe_output" ref="o7" 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#92224ef5b74a148faa0459a1ff6edd6c">stp_printfuncs_t::describe_output</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -75,13 +60,13 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -98,13 +83,13 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -121,13 +106,13 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -144,13 +129,13 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -167,13 +152,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="54879ee9c7f05b72f24bab4bce932970"></a><!-- doxytag: member="stp_printfuncs_t::list_parameters" ref="54879ee9c7f05b72f24bab4bce932970" args=")(const stp_vars_t *v)" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_printfuncs_t::list_parameters" ref="o0" 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__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>
+          <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>
         </tr>
       </table>
     </td>
@@ -190,13 +175,13 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -213,13 +198,13 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -236,13 +221,13 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -259,13 +244,13 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -282,13 +267,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="7cc301b263aa0c00e3b8d67b79b9949e"></a><!-- doxytag: member="stp_printfuncs_t::verify" ref="7cc301b263aa0c00e3b8d67b79b9949e" args=")(stp_vars_t *v)" --><p>
+<a class="anchor" name="o8"></a><!-- doxytag: member="stp_printfuncs_t::verify" ref="o8" 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#7cc301b263aa0c00e3b8d67b79b9949e">stp_printfuncs_t::verify</a>)(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -307,8 +292,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html
index 60c27ba..18da612 100644
--- a/doc/gutenprint/html/structstp__raw__t.html
+++ b/doc/gutenprint/html/structstp__raw__t.html
@@ -2,24 +2,9 @@
 <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.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>
+<!-- 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>
 <h1>stp_raw_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -30,23 +15,23 @@
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></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 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 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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Raw parameter. 
 <p>
-<hr><h2>Member Typedef Documentation</h2>
-<a class="anchor" name="4b3a6218bb3e3a7303e8a171a60fcf92"></a><!-- doxytag: member="stp_raw_t::bytes" ref="4b3a6218bb3e3a7303e8a171a60fcf92" args="" --><p>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_raw_t::bytes" ref="o0" 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 size_t <a class="el" href="structstp__raw__t.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_raw_t::bytes</a>          </td>
+          <td class="md" nowrap valign="top">size_t <a class="el" href="structstp__raw__t.html#o0">stp_raw_t::bytes</a>          </td>
         </tr>
       </table>
     </td>
@@ -63,13 +48,13 @@ Raw parameter.
 Size of data.     </td>
   </tr>
 </table>
-<a class="anchor" name="8d777f385d3dfec8815d20f7496026dc"></a><!-- doxytag: member="stp_raw_t::data" ref="8d777f385d3dfec8815d20f7496026dc" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_raw_t::data" ref="o1" 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="structstp__raw__t.html#8d777f385d3dfec8815d20f7496026dc">stp_raw_t::data</a>          </td>
+          <td class="md" nowrap valign="top">const void* <a class="el" href="structstp__raw__t.html#o1">stp_raw_t::data</a>          </td>
         </tr>
       </table>
     </td>
@@ -88,8 +73,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade.html
index b744a8e..a3c84a9 100644
--- a/doc/gutenprint/html/structstp__shade.html
+++ b/doc/gutenprint/html/structstp__shade.html
@@ -2,44 +2,29 @@
 <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.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>
+<!-- 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>
 <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#2063c1608d6e0baf80249c42e2be5804">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#o0">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#adae9e852b659d0d064b746f5cc85ee4">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#o1">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#c4b0221c67b0895782c9c5984cc2578e">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#o2">dot_sizes</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="c4b0221c67b0895782c9c5984cc2578e"></a><!-- doxytag: member="stp_shade::dot_sizes" ref="c4b0221c67b0895782c9c5984cc2578e" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_shade::dot_sizes" ref="o2" 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#c4b0221c67b0895782c9c5984cc2578e">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#o2">stp_shade::dot_sizes</a>          </td>
         </tr>
       </table>
     </td>
@@ -56,13 +41,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="adae9e852b659d0d064b746f5cc85ee4"></a><!-- doxytag: member="stp_shade::numsizes" ref="adae9e852b659d0d064b746f5cc85ee4" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_shade::numsizes" ref="o1" 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#adae9e852b659d0d064b746f5cc85ee4">stp_shade::numsizes</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__shade.html#o1">stp_shade::numsizes</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,13 +64,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2063c1608d6e0baf80249c42e2be5804"></a><!-- doxytag: member="stp_shade::value" ref="2063c1608d6e0baf80249c42e2be5804" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_shade::value" ref="o0" 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#2063c1608d6e0baf80249c42e2be5804">stp_shade::value</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__shade.html#o0">stp_shade::value</a>          </td>
         </tr>
       </table>
     </td>
@@ -104,8 +89,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html
index 8a3d154..f4461a9 100644
--- a/doc/gutenprint/html/structstp__weave__t.html
+++ b/doc/gutenprint/html/structstp__weave__t.html
@@ -2,52 +2,37 @@
 <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.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>
+<!-- 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>
 <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#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#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#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#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#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#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#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#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#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#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#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#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#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__weave__t.html#o6">physpassend</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="564f60a2dd82ea24bfa3f2f615348f7c"></a><!-- doxytag: member="stp_weave_t::jet" ref="564f60a2dd82ea24bfa3f2f615348f7c" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_weave_t::jet" ref="o2" 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#564f60a2dd82ea24bfa3f2f615348f7c">stp_weave_t::jet</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o2">stp_weave_t::jet</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,13 +49,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="da94ad894675e9119f2c647a94e21605"></a><!-- doxytag: member="stp_weave_t::logicalpassstart" ref="da94ad894675e9119f2c647a94e21605" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_weave_t::logicalpassstart" ref="o4" 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#da94ad894675e9119f2c647a94e21605">stp_weave_t::logicalpassstart</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o4">stp_weave_t::logicalpassstart</a>          </td>
         </tr>
       </table>
     </td>
@@ -87,13 +72,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="6b75dc88fe75f396206e0c5862d61543"></a><!-- doxytag: member="stp_weave_t::missingstartrows" ref="6b75dc88fe75f396206e0c5862d61543" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_weave_t::missingstartrows" ref="o3" 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#6b75dc88fe75f396206e0c5862d61543">stp_weave_t::missingstartrows</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o3">stp_weave_t::missingstartrows</a>          </td>
         </tr>
       </table>
     </td>
@@ -110,13 +95,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="1a1dc91c907325c69271ddf0c944bc72"></a><!-- doxytag: member="stp_weave_t::pass" ref="1a1dc91c907325c69271ddf0c944bc72" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_weave_t::pass" ref="o1" 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#1a1dc91c907325c69271ddf0c944bc72">stp_weave_t::pass</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o1">stp_weave_t::pass</a>          </td>
         </tr>
       </table>
     </td>
@@ -133,13 +118,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="102875318f07394cc762ba839e0b5231"></a><!-- doxytag: member="stp_weave_t::physpassend" ref="102875318f07394cc762ba839e0b5231" args="" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="stp_weave_t::physpassend" ref="o6" 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#102875318f07394cc762ba839e0b5231">stp_weave_t::physpassend</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o6">stp_weave_t::physpassend</a>          </td>
         </tr>
       </table>
     </td>
@@ -156,13 +141,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="13436ac9693968e5601e30fd01451a02"></a><!-- doxytag: member="stp_weave_t::physpassstart" ref="13436ac9693968e5601e30fd01451a02" args="" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="stp_weave_t::physpassstart" ref="o5" 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#13436ac9693968e5601e30fd01451a02">stp_weave_t::physpassstart</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o5">stp_weave_t::physpassstart</a>          </td>
         </tr>
       </table>
     </td>
@@ -179,13 +164,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="f1965a857bc285d26fe22023aa5ab50d"></a><!-- doxytag: member="stp_weave_t::row" ref="f1965a857bc285d26fe22023aa5ab50d" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_weave_t::row" ref="o0" 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#f1965a857bc285d26fe22023aa5ab50d">stp_weave_t::row</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o0">stp_weave_t::row</a>          </td>
         </tr>
       </table>
     </td>
@@ -204,8 +189,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/tab_b.gif b/doc/gutenprint/html/tab_b.gif
deleted file mode 100644
index 0d62348..0000000
--- a/doc/gutenprint/html/tab_b.gif
+++ /dev/null
diff --git a/doc/gutenprint/html/tab_l.gif b/doc/gutenprint/html/tab_l.gif
deleted file mode 100644
index 9b1e633..0000000
--- a/doc/gutenprint/html/tab_l.gif
+++ /dev/null
diff --git a/doc/gutenprint/html/tab_r.gif b/doc/gutenprint/html/tab_r.gif
deleted file mode 100644
index ce9dd9f..0000000
--- a/doc/gutenprint/html/tab_r.gif
+++ /dev/null
diff --git a/doc/gutenprint/html/tabs.css b/doc/gutenprint/html/tabs.css
deleted file mode 100644
index a61552a..0000000
--- a/doc/gutenprint/html/tabs.css
+++ /dev/null
@@ -1,102 +0,0 @@
-/* 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 eeea931..5cd3ed1 100644
--- a/doc/gutenprint/html/unionstp__mxml__value__u.html
+++ b/doc/gutenprint/html/unionstp__mxml__value__u.html
@@ -2,48 +2,33 @@
 <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.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>
+<!-- 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>
 <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#8e2dcfd7e7e24b1ca76c1193f645902b">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#o0">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#157db7df530023575515d366c9b672e8">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#o1">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#94619f8a70068b2591c2eed622525b0e">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#o2">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#4bca24304861acde5770fdbe3cc2503b">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#o3">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#1cb251ec0d568de6a929b520c4aed8d1">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#o4">text</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="8e2dcfd7e7e24b1ca76c1193f645902b"></a><!-- doxytag: member="stp_mxml_value_u::element" ref="8e2dcfd7e7e24b1ca76c1193f645902b" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_value_u::element" ref="o0" 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#8e2dcfd7e7e24b1ca76c1193f645902b">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#o0">stp_mxml_value_u::element</a>          </td>
         </tr>
       </table>
     </td>
@@ -60,13 +45,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="157db7df530023575515d366c9b672e8"></a><!-- doxytag: member="stp_mxml_value_u::integer" ref="157db7df530023575515d366c9b672e8" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_value_u::integer" ref="o1" 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#157db7df530023575515d366c9b672e8">stp_mxml_value_u::integer</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="unionstp__mxml__value__u.html#o1">stp_mxml_value_u::integer</a>          </td>
         </tr>
       </table>
     </td>
@@ -83,13 +68,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="94619f8a70068b2591c2eed622525b0e"></a><!-- doxytag: member="stp_mxml_value_u::opaque" ref="94619f8a70068b2591c2eed622525b0e" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stp_mxml_value_u::opaque" ref="o2" 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#94619f8a70068b2591c2eed622525b0e">stp_mxml_value_u::opaque</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="unionstp__mxml__value__u.html#o2">stp_mxml_value_u::opaque</a>          </td>
         </tr>
       </table>
     </td>
@@ -106,13 +91,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="4bca24304861acde5770fdbe3cc2503b"></a><!-- doxytag: member="stp_mxml_value_u::real" ref="4bca24304861acde5770fdbe3cc2503b" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stp_mxml_value_u::real" ref="o3" 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#4bca24304861acde5770fdbe3cc2503b">stp_mxml_value_u::real</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="unionstp__mxml__value__u.html#o3">stp_mxml_value_u::real</a>          </td>
         </tr>
       </table>
     </td>
@@ -129,13 +114,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="1cb251ec0d568de6a929b520c4aed8d1"></a><!-- doxytag: member="stp_mxml_value_u::text" ref="1cb251ec0d568de6a929b520c4aed8d1" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stp_mxml_value_u::text" ref="o4" 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#1cb251ec0d568de6a929b520c4aed8d1">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#o4">stp_mxml_value_u::text</a>          </td>
         </tr>
       </table>
     </td>
@@ -154,8 +139,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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html
index 4852989..609bcf4 100644
--- a/doc/gutenprint/html/util_8h.html
+++ b/doc/gutenprint/html/util_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -28,127 +14,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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#g44a234fbf1ab832399fc674c8cb53b1f">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#ga54">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#g69354e5830712093045a4ba290a298f8">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#ga0">stp_init</a> (void)</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">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">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="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="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#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#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#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#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&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 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 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&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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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#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&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 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&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 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&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 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">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">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">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">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&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 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&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 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 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&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#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#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#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#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#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#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#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#gabf89ff6213b9dc568fbdd1342b663ad">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#ga27">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#g054943d301baecba82cdb78b7e454880">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#ga28">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#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#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#g2f861f4a98ad496ca8cd995147867f32">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#ga30">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#g77022a2cfde3a9ba9269f1bc3726175c">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#ga31">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#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 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 release version string (x.y).  <a href="group__util.html#ged2a65d98cba1fd6d48c0cc1b611ae0f"></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#ga32"></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 Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html
index 7ab6499..6c6b370 100644
--- a/doc/gutenprint/html/vars_8h.html
+++ b/doc/gutenprint/html/vars_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -42,450 +28,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#gde33aeed00b53e4af71ee1f7c4326279">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#ga0">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#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 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 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 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 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">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">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="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="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 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 stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9ee295029ad2d072b4099dc390359900">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#ga6">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#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>, 
+<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>, 
 <br>
-&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>, 
+&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>, 
 <br>
-&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>
+&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>
 <br>
  }</td></tr>
 
-<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>
+<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>
  }</td></tr>
 
-<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>, 
+<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>, 
 <br>
-&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>, 
+&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>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3">STP_PARAMETER_LEVEL_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a29">STP_PARAMETER_LEVEL_INVALID</a>
 <br>
  }</td></tr>
 
-<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>
+<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>
  }</td></tr>
 
-<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>
+<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>
  }</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#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="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="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">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">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 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 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">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">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">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">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#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#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">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">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">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">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#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#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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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 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 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">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">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 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 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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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#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#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 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 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#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#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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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">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">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#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#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 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 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#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#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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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 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 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 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 (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) 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) 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) 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) 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 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 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 (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 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 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 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 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 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">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">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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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">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">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">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">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">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">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="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="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#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#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">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"><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"><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">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">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">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#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#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#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#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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Print job functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html
index 9082fa2..1bb83be 100644
--- a/doc/gutenprint/html/weave_8h.html
+++ b/doc/gutenprint/html/weave_8h.html
@@ -2,25 +2,11 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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">
@@ -41,67 +27,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#46ee59dd8e65c35e69ba8cfa94e90786">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#a0">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#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 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 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#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#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 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 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 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 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#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>, 
+<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>, 
 <br>
-&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>
+&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>
 <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#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#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#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#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#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">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"><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__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__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__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__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"><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">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">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"><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"><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">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 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 colspan="2"><br><h2>Variables</h2></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#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#b81173e35f655b1a8f0047cbadce5391">stp_pack_uncompressed</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#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#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#fb161f053574d9cd4a47b613b614b0f3">stp_fill_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#a8">stp_fill_uncompressed</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#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#f6c7a76f229fdc0be020a53a15a4a5f5">stp_compute_uncompressed_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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Softweave functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="46ee59dd8e65c35e69ba8cfa94e90786"></a><!-- doxytag: member="weave.h::STP_MAX_WEAVE" ref="46ee59dd8e65c35e69ba8cfa94e90786" args="" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="weave.h::STP_MAX_WEAVE" ref="a0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -125,13 +111,13 @@ Softweave functions.
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="520099a705f78fd503d204665ee21d5d"></a><!-- doxytag: member="weave.h::stp_compute_linewidth_func" ref="520099a705f78fd503d204665ee21d5d" args="(stp_vars_t *v, int n)" --><p>
+<a class="anchor" name="a4"></a><!-- doxytag: member="weave.h::stp_compute_linewidth_func" ref="a4" 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#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a>(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int n)          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -148,13 +134,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -171,13 +157,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#76c426b3b4c3b2503c54f2c2a013768a">stp_flushfunc</a>(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">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#a3">stp_flushfunc</a>(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int passno, int vertical_subpass)          </td>
         </tr>
       </table>
     </td>
@@ -194,13 +180,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -218,13 +204,13 @@ Softweave functions.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="6233c2f715aee6e6c2e9935f0e2ce027"></a><!-- doxytag: member="weave.h::stp_weave_strategy_t" ref="6233c2f715aee6e6c2e9935f0e2ce027" args="" --><p>
+<a class="anchor" name="a26"></a><!-- doxytag: member="weave.h::stp_weave_strategy_t" ref="a26" 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#6233c2f715aee6e6c2e9935f0e2ce027">stp_weave_strategy_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="weave_8h.html#a26">stp_weave_strategy_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -240,17 +226,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="6233c2f715aee6e6c2e9935f0e2ce02741a2ca9b1c97ec5a62795faf4968dcfc"></a><!-- doxytag: member="STP_WEAVE_ZIGZAG" ref="6233c2f715aee6e6c2e9935f0e2ce02741a2ca9b1c97ec5a62795faf4968dcfc" args="" -->STP_WEAVE_ZIGZAG</em>&nbsp;</td><td>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
 </table>
 </dl>
@@ -258,7 +244,7 @@ Softweave functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="5b0aac599abc4859e2d208db7185cdbf"></a><!-- doxytag: member="weave.h::stp_flush_all" ref="5b0aac599abc4859e2d208db7185cdbf" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="a18"></a><!-- doxytag: member="weave.h::stp_flush_all" ref="a18" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -266,7 +252,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">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>
@@ -286,7 +272,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -294,7 +280,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -323,7 +309,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -331,7 +317,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -360,7 +346,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -368,7 +354,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -397,7 +383,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -405,7 +391,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -434,7 +420,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -442,7 +428,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -471,7 +457,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -479,7 +465,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -557,31 +543,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#6233c2f715aee6e6c2e9935f0e2ce027">stp_weave_strategy_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="weave_8h.html#a26">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#76c426b3b4c3b2503c54f2c2a013768a">stp_flushfunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="weave_8h.html#a3">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#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="weave_8h.html#a2">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#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="weave_8h.html#a1">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#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>&nbsp;</td>
           <td class="mdname" nowrap></td>
         </tr>
         <tr>
@@ -604,7 +590,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -612,7 +598,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&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="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -653,7 +639,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -661,7 +647,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#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -691,13 +677,13 @@ Softweave functions.
   </tr>
 </table>
 <hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a6df061ed81c1a6ecb8854b6eab4e276"></a><!-- doxytag: member="weave.h::stp_compute_tiff_linewidth" ref="a6df061ed81c1a6ecb8854b6eab4e276" args="" --><p>
+<a class="anchor" name="a9"></a><!-- doxytag: member="weave.h::stp_compute_tiff_linewidth" ref="a9" 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#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#a6df061ed81c1a6ecb8854b6eab4e276">stp_compute_tiff_linewidth</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -714,13 +700,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="f6c7a76f229fdc0be020a53a15a4a5f5"></a><!-- doxytag: member="weave.h::stp_compute_uncompressed_linewidth" ref="f6c7a76f229fdc0be020a53a15a4a5f5" args="" --><p>
+<a class="anchor" name="a10"></a><!-- doxytag: member="weave.h::stp_compute_uncompressed_linewidth" ref="a10" 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#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#f6c7a76f229fdc0be020a53a15a4a5f5">stp_compute_uncompressed_linewidth</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -737,13 +723,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="6c47bead0399664b9041a6d5687b091e"></a><!-- doxytag: member="weave.h::stp_fill_tiff" ref="6c47bead0399664b9041a6d5687b091e" args="" --><p>
+<a class="anchor" name="a7"></a><!-- doxytag: member="weave.h::stp_fill_tiff" ref="a7" 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#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a> <a class="el" href="weave_8h.html#6c47bead0399664b9041a6d5687b091e">stp_fill_tiff</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -760,13 +746,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="fb161f053574d9cd4a47b613b614b0f3"></a><!-- doxytag: member="weave.h::stp_fill_uncompressed" ref="fb161f053574d9cd4a47b613b614b0f3" args="" --><p>
+<a class="anchor" name="a8"></a><!-- doxytag: member="weave.h::stp_fill_uncompressed" ref="a8" 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#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a> <a class="el" href="weave_8h.html#fb161f053574d9cd4a47b613b614b0f3">stp_fill_uncompressed</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -783,13 +769,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="27cae2ded3a9434dd6f332dbf6721f71"></a><!-- doxytag: member="weave.h::stp_pack_tiff" ref="27cae2ded3a9434dd6f332dbf6721f71" args="" --><p>
+<a class="anchor" name="a5"></a><!-- doxytag: member="weave.h::stp_pack_tiff" ref="a5" 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#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a> <a class="el" href="weave_8h.html#27cae2ded3a9434dd6f332dbf6721f71">stp_pack_tiff</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -806,13 +792,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="b81173e35f655b1a8f0047cbadce5391"></a><!-- doxytag: member="weave.h::stp_pack_uncompressed" ref="b81173e35f655b1a8f0047cbadce5391" args="" --><p>
+<a class="anchor" name="a6"></a><!-- doxytag: member="weave.h::stp_pack_uncompressed" ref="a6" 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#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a> <a class="el" href="weave_8h.html#b81173e35f655b1a8f0047cbadce5391">stp_pack_uncompressed</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -829,8 +815,8 @@ Softweave functions.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html
index 5c4760d..b86b49c 100644
--- a/doc/gutenprint/html/xml_8h.html
+++ b/doc/gutenprint/html/xml_8h.html
@@ -2,88 +2,74 @@
 <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.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>
+<!-- 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__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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#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 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 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#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#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#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#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#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#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#f9605dfeaf5ba8c41b42aba2c09b4f20">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#a4">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#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#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#477e8c523df78a068e98be5e929d6825">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#a6">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#56885d576d38f8fbffce10834e892117">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#a7">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#9d7f6cba6d4f5b8b01b6d3c192d10596">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#a8">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#666632a9a3cb7f802fd5478d68d57166">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#a9">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#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#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#d35445001b4f0ff02b45cf411b056cb2">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#a11">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#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#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#d698808efae24e1f0002243256171fc0">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#a13">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#e2aeb50ec9bffd4cc7ff4b8756ce503a">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#a14">stp_xml_preinit</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="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="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="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="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="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="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="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="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="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="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="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"><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">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>
+<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>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 XML tree functions. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -101,13 +87,13 @@ XML tree functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="301d2355b8bb9986a7bc4f84cc6c9d40"></a><!-- doxytag: member="xml.h::stp_array_create_from_xmltree" ref="301d2355b8bb9986a7bc4f84cc6c9d40" args="(stp_mxml_node_t *array)" --><p>
+<a class="anchor" name="a19"></a><!-- doxytag: member="xml.h::stp_array_create_from_xmltree" ref="a19" 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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* stp_array_create_from_xmltree           </td>
+          <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" 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>
@@ -129,13 +115,13 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="4b39835d489b183bdf939551f7b6871b"></a><!-- doxytag: member="xml.h::stp_curve_create_from_xmltree" ref="4b39835d489b183bdf939551f7b6871b" args="(stp_mxml_node_t *da)" --><p>
+<a class="anchor" name="a17"></a><!-- doxytag: member="xml.h::stp_curve_create_from_xmltree" ref="a17" 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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create_from_xmltree           </td>
+          <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" 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>
@@ -157,7 +143,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -171,7 +157,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#ec3dca5a8c562175532452b7a055200f">stp_xml_parse_func</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="xml_8h.html#a0">stp_xml_parse_func</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>parse_func</em></td>
         </tr>
         <tr>
@@ -194,7 +180,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="0377f341fce4c764d695b851cf90125c"></a><!-- doxytag: member="xml.h::stp_register_xml_preload" ref="0377f341fce4c764d695b851cf90125c" args="(const char *filename)" --><p>
+<a class="anchor" name="a3"></a><!-- doxytag: member="xml.h::stp_register_xml_preload" ref="a3" args="(const char *filename)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -222,13 +208,13 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="174add090763cd3d8a019da75257e9c5"></a><!-- doxytag: member="xml.h::stp_sequence_create_from_xmltree" ref="174add090763cd3d8a019da75257e9c5" args="(stp_mxml_node_t *da)" --><p>
+<a class="anchor" name="a15"></a><!-- doxytag: member="xml.h::stp_sequence_create_from_xmltree" ref="a15" 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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>* stp_sequence_create_from_xmltree           </td>
+          <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" 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>
@@ -250,7 +236,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="bdff70654d8ca31445e0957cfad68816"></a><!-- doxytag: member="xml.h::stp_unregister_xml_parser" ref="bdff70654d8ca31445e0957cfad68816" args="(const char *name)" --><p>
+<a class="anchor" name="a2"></a><!-- doxytag: member="xml.h::stp_unregister_xml_parser" ref="a2" args="(const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -278,7 +264,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="f9605dfeaf5ba8c41b42aba2c09b4f20"></a><!-- doxytag: member="xml.h::stp_unregister_xml_preload" ref="f9605dfeaf5ba8c41b42aba2c09b4f20" args="(const char *filename)" --><p>
+<a class="anchor" name="a4"></a><!-- doxytag: member="xml.h::stp_unregister_xml_preload" ref="a4" args="(const char *filename)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -306,7 +292,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="d35445001b4f0ff02b45cf411b056cb2"></a><!-- doxytag: member="xml.h::stp_xml_exit" ref="d35445001b4f0ff02b45cf411b056cb2" args="(void)" --><p>
+<a class="anchor" name="a11"></a><!-- doxytag: member="xml.h::stp_xml_exit" ref="a11" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -334,7 +320,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="acec0c2b6d806a70b74c2c9efb5ca895"></a><!-- doxytag: member="xml.h::stp_xml_get_node" ref="acec0c2b6d806a70b74c2c9efb5ca895" args="(stp_mxml_node_t *xmlroot,...)" --><p>
+<a class="anchor" name="a12"></a><!-- doxytag: member="xml.h::stp_xml_get_node" ref="a12" args="(stp_mxml_node_t *xmlroot,...)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -371,7 +357,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="e279cdb2639cb00884563204c586e34a"></a><!-- doxytag: member="xml.h::stp_xml_init" ref="e279cdb2639cb00884563204c586e34a" args="(void)" --><p>
+<a class="anchor" name="a10"></a><!-- doxytag: member="xml.h::stp_xml_init" ref="a10" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -399,7 +385,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="9e2620e798edcd889cd80454374a0a1d"></a><!-- doxytag: member="xml.h::stp_xml_init_defaults" ref="9e2620e798edcd889cd80454374a0a1d" args="(void)" --><p>
+<a class="anchor" name="a5"></a><!-- doxytag: member="xml.h::stp_xml_init_defaults" ref="a5" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -427,7 +413,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="477e8c523df78a068e98be5e929d6825"></a><!-- doxytag: member="xml.h::stp_xml_parse_file" ref="477e8c523df78a068e98be5e929d6825" args="(const char *file)" --><p>
+<a class="anchor" name="a6"></a><!-- doxytag: member="xml.h::stp_xml_parse_file" ref="a6" args="(const char *file)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -455,7 +441,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="2ff6722b18cd21c91e60e7ef1cedc0d4"></a><!-- doxytag: member="xml.h::stp_xml_parse_file_named" ref="2ff6722b18cd21c91e60e7ef1cedc0d4" args="(const char *name)" --><p>
+<a class="anchor" name="a21"></a><!-- doxytag: member="xml.h::stp_xml_parse_file_named" ref="a21" args="(const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -483,7 +469,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="e2aeb50ec9bffd4cc7ff4b8756ce503a"></a><!-- doxytag: member="xml.h::stp_xml_preinit" ref="e2aeb50ec9bffd4cc7ff4b8756ce503a" args="(void)" --><p>
+<a class="anchor" name="a14"></a><!-- doxytag: member="xml.h::stp_xml_preinit" ref="a14" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -511,7 +497,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="d698808efae24e1f0002243256171fc0"></a><!-- doxytag: member="xml.h::stp_xmldoc_create_generic" ref="d698808efae24e1f0002243256171fc0" args="(void)" --><p>
+<a class="anchor" name="a13"></a><!-- doxytag: member="xml.h::stp_xmldoc_create_generic" ref="a13" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -539,7 +525,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="666632a9a3cb7f802fd5478d68d57166"></a><!-- doxytag: member="xml.h::stp_xmlstrtod" ref="666632a9a3cb7f802fd5478d68d57166" args="(const char *textval)" --><p>
+<a class="anchor" name="a9"></a><!-- doxytag: member="xml.h::stp_xmlstrtod" ref="a9" args="(const char *textval)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -567,7 +553,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="56885d576d38f8fbffce10834e892117"></a><!-- doxytag: member="xml.h::stp_xmlstrtol" ref="56885d576d38f8fbffce10834e892117" args="(const char *value)" --><p>
+<a class="anchor" name="a7"></a><!-- doxytag: member="xml.h::stp_xmlstrtol" ref="a7" args="(const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -595,7 +581,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="9d7f6cba6d4f5b8b01b6d3c192d10596"></a><!-- doxytag: member="xml.h::stp_xmlstrtoul" ref="9d7f6cba6d4f5b8b01b6d3c192d10596" args="(const char *value)" --><p>
+<a class="anchor" name="a8"></a><!-- doxytag: member="xml.h::stp_xmlstrtoul" ref="a8" args="(const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -623,7 +609,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="90e7cdadf10d6492082fd008b79853b0"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_array" ref="90e7cdadf10d6492082fd008b79853b0" args="(const stp_array_t *array)" --><p>
+<a class="anchor" name="a20"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_array" ref="a20" args="(const stp_array_t *array)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -631,7 +617,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#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&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="mdname1" valign="top" nowrap> <em>array</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -651,7 +637,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="286050c77ae8ee255a7b6035b88d5fb4"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_curve" ref="286050c77ae8ee255a7b6035b88d5fb4" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="a18"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_curve" ref="a18" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -659,7 +645,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#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&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="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -679,7 +665,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="134d8ffe83aa1bc29ca65869af337479"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_sequence" ref="134d8ffe83aa1bc29ca65869af337479" args="(const stp_sequence_t *seq)" --><p>
+<a class="anchor" name="a16"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_sequence" ref="a16" args="(const stp_sequence_t *seq)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -687,7 +673,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#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&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="mdname1" valign="top" nowrap> <em>seq</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -707,8 +693,8 @@ XML tree functions.
     </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;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:52 2006 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>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/gutenprintui2.tag b/doc/gutenprintui2/gutenprintui2.tag
index 44aed60..04d41ea 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/rleigh/gutenprint-debian-dist/include/gutenprintui2/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>5795444c0586277d34c693fc7b5deae0</anchor>
+      <anchor>a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_CURVE</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>767d8cf354306a35dc6b53e2aa033aa6</anchor>
+      <anchor>a1</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_CURVE_CLASS</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>9a1005d0077d10338a6a7f16940e8233</anchor>
+      <anchor>a2</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_CURVE</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>e886ed1f007a40362f784d16c020ff40</anchor>
+      <anchor>a3</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_CURVE_CLASS</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>fc44896a3decd9b178cec7f90598c8b8</anchor>
+      <anchor>a4</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_CURVE_GET_CLASS</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>5995f171eca6b87af06afde3160fcac0</anchor>
+      <anchor>a5</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiCurve</type>
       <name>StpuiCurve</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>04ae3b4e227fca5f2aa871b0f9e1cab0</anchor>
+      <anchor>a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiCurveClass</type>
       <name>StpuiCurveClass</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>13e6043625efd88837615685f7472e2d</anchor>
+      <anchor>a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>StpuiCurveType</name>
-      <anchor>7d44faf53d74002f61d5805ac34d968e</anchor>
+      <anchor>a19</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_LINEAR</name>
-      <anchor>7d44faf53d74002f61d5805ac34d968ee32d2131f9b7e70d109be088fcd23297</anchor>
+      <anchor>a19a8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_SPLINE</name>
-      <anchor>7d44faf53d74002f61d5805ac34d968e50f0699c4a326f98d9ece6faca5dbb06</anchor>
+      <anchor>a19a9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_FREE</name>
-      <anchor>7d44faf53d74002f61d5805ac34d968e7449e4eef5779fc4da5e2ca2341c84da</anchor>
+      <anchor>a19a10</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>stpui_curve_get_type</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>3eafd87334a70bb87fca2084b558c2b2</anchor>
+      <anchor>a11</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>23667321d3acf52249e8c18506be017d</anchor>
+      <anchor>a12</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_reset</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>eb1c0e9894aaa04ade62d050aa5ea15b</anchor>
+      <anchor>a13</anchor>
       <arglist>(StpuiCurve *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_set_gamma</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>2b8cf1c1a6badf89c3a7b95c87b91a72</anchor>
+      <anchor>a14</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>3701325c36b957b91b5e2719ffbaa28a</anchor>
+      <anchor>a15</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>6dfbda8721d6d652ef8f710a696d6367</anchor>
+      <anchor>a16</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>f611be61b641f4efc9b6044aacf98103</anchor>
+      <anchor>a17</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>9d6d8e461caf28083c2e1b76639c7d24</anchor>
+      <anchor>a18</anchor>
       <arglist>(StpuiCurve *curve, StpuiCurveType type)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gammacurve.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprintui2/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>2575918538735bd891f2e4d9ec05d7b1</anchor>
+      <anchor>a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_GAMMA_CURVE</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>679501caed595f5d700271b9991b724f</anchor>
+      <anchor>a1</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_GAMMA_CURVE_CLASS</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>8272afcf9ea42c3823c2d201fa13ba39</anchor>
+      <anchor>a2</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_GAMMA_CURVE</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>3838127029e05b8b71b4bb177ae8212e</anchor>
+      <anchor>a3</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_GAMMA_CURVE_CLASS</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>c574b30d0e65b8f5f6cd110405cbe9fb</anchor>
+      <anchor>a4</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_GAMMA_CURVE_GET_CLASS</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>9d8fed0608357a55c11c5adba1f6d1b5</anchor>
+      <anchor>a5</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiGammaCurve</type>
       <name>StpuiGammaCurve</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>e112dc0cc75594e7e8efd332fe2c9c5b</anchor>
+      <anchor>a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiGammaCurveClass</type>
       <name>StpuiGammaCurveClass</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>4ab4956b6af215068a2592a98ae43cbc</anchor>
+      <anchor>a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>stpui_gamma_curve_get_type</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>57a0864588671f9b1ed5a64be3a06ed5</anchor>
+      <anchor>a8</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>b3038f4fe63c6035e3f1ec876559d8f9</anchor>
+      <anchor>a9</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprintui.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprintui2/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>f0f2e236d924323378ded67b3e434dd5</anchor>
+      <anchor>a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>guchar *(*</type>
       <name>get_thumbnail_func_t</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>6867fbda8dc5650678af5a23979386b8</anchor>
+      <anchor>a1</anchor>
       <arglist>)(void *data, gint *width, gint *height, gint *bpp, gint page)</arglist>
     </member>
     <member kind="enumeration">
       <name>orient_t</name>
-      <anchor>b72dd018d9f09ee35f7ac40fc7f29593</anchor>
+      <anchor>a62</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_AUTO</name>
-      <anchor>b72dd018d9f09ee35f7ac40fc7f29593c90c0226859f895bd60176c7d414e4f0</anchor>
+      <anchor>a62a2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_PORTRAIT</name>
-      <anchor>b72dd018d9f09ee35f7ac40fc7f295939e273eeca1c05d1a25e93ea977149f80</anchor>
+      <anchor>a62a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_LANDSCAPE</name>
-      <anchor>b72dd018d9f09ee35f7ac40fc7f2959329a34c1af72e3dc2ccdea5213fe5adba</anchor>
+      <anchor>a62a4</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_UPSIDEDOWN</name>
-      <anchor>b72dd018d9f09ee35f7ac40fc7f2959344c3bb5aa3e545544bcce606de1d8b88</anchor>
+      <anchor>a62a5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_SEASCAPE</name>
-      <anchor>b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581</anchor>
+      <anchor>a62a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>command_t</name>
-      <anchor>1d9b1ad69ddba33dc7f51bf85792777d</anchor>
+      <anchor>a63</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_DEFAULT</name>
-      <anchor>1d9b1ad69ddba33dc7f51bf85792777de8968fd1ea61243b41d783dc1a8a3bfb</anchor>
+      <anchor>a63a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_CUSTOM</name>
-      <anchor>1d9b1ad69ddba33dc7f51bf85792777d950ffcaaf0cd1ae6a5eeff2bdcc93cda</anchor>
+      <anchor>a63a8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_FILE</name>
-      <anchor>1d9b1ad69ddba33dc7f51bf85792777da0c9f5896feee455150bda141bfd3f40</anchor>
+      <anchor>a63a9</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_name</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>8ad3d342e15a406c942d52a7d5e093b8</anchor>
+      <anchor>a10</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>ad9fc64007c7867e05743b6a30664fc4</anchor>
+      <anchor>a11</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>c70ee1c3425b1a3be74a5dfc3476f079</anchor>
+      <anchor>a12</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>8267cf35fd86b40ce1bddb958bc0828d</anchor>
+      <anchor>a13</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>7b54207ec204cbe3327284ac9d56b188</anchor>
+      <anchor>a14</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>aecb54cd0535976fd51b2be080366c22</anchor>
+      <anchor>a15</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>e0e2a359527aded6f2dc60fe6ec5ff55</anchor>
+      <anchor>a16</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>8a751b01cba31f15aed8f39ef72f8e37</anchor>
+      <anchor>a17</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>f593816f98fad12bf48d461fe72ff31e</anchor>
+      <anchor>a18</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>6fba852c389ed20d9d1da1610d3125db</anchor>
+      <anchor>a19</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>b63f9f05403aa8edd3fc9a063d558a88</anchor>
+      <anchor>a20</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>6b83f5dbcdf2deeef19726e468d7cfe3</anchor>
+      <anchor>a21</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>5f04be99f3a2d8d788bd929d01823a75</anchor>
+      <anchor>a22</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>13c2730e5161bf18e3a31fe4d2bb0b31</anchor>
+      <anchor>a23</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>b31d172f0c6755ac149b498800c46141</anchor>
+      <anchor>a24</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>3252b3c283aca1a71da38ae9a7b9b9b5</anchor>
+      <anchor>a25</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>4effa689c6a5e828c672b3feb0c91623</anchor>
+      <anchor>a26</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>c1e81fe45a8a3b4a6cd2682cdc21ddd1</anchor>
+      <anchor>a27</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>8f7fe530f483f07c08dbe81efebbdb7a</anchor>
+      <anchor>a28</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>276c7fbf168c1431d8dce2f1393dac09</anchor>
+      <anchor>a29</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>b3cfd6a8b492bda54150c716f1631b4f</anchor>
+      <anchor>a30</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>2f5b046cd01c6ad5bbccd485165928d7</anchor>
+      <anchor>a31</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>35603794767eb756a784a74220e2e0cb</anchor>
+      <anchor>a32</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>51decc80a312291c9f99cde8a18393a6</anchor>
+      <anchor>a33</anchor>
       <arglist>(const char *param)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_copy</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a41fef36c0775105b3187708dbd9700a</anchor>
+      <anchor>a34</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>9b28f7223268ab81ff605e733ebf97e5</anchor>
+      <anchor>a35</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>63325efb553d690c83608ad9d75b9c5c</anchor>
+      <anchor>a36</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>8aa89d084c3364396974b7665f5a26f9</anchor>
+      <anchor>a37</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stpui_build_standard_print_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>e63acdc3a4074290111bb1cece4437a1</anchor>
+      <anchor>a38</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>98928c6f53a0322dad08f1057882b2fd</anchor>
+      <anchor>a39</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>47f72a1bf50eac641ab4f72af5ed379f</anchor>
+      <anchor>a40</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_printrc_load</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>9768d9e8d5370bdd66710de1df8fe4d3</anchor>
+      <anchor>a41</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_get_system_printers</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>35da543417b8be45c11c02c590bf4ef5</anchor>
+      <anchor>a42</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_printrc_save</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>ea786257cd4a43a3ab947eb09d19907c</anchor>
+      <anchor>a43</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_filename</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>849dc9d8235aeae8c294ea97d3a2291d</anchor>
+      <anchor>a44</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>b46b5187c4d36188019c556f8685efdc</anchor>
+      <anchor>a45</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_errfunc</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>cedc4d703e8a6e88243241245748a144</anchor>
+      <anchor>a46</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>92ac2b023b0352cb3d519ece77ccc51c</anchor>
+      <anchor>a47</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_errdata</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>6bc23edc145044cffc5f9457f759523e</anchor>
+      <anchor>a48</anchor>
       <arglist>(void *errdata)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stpui_get_errdata</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>1280f5bad08d4f7ccbfbd64785102ce2</anchor>
+      <anchor>a49</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>gint</type>
       <name>stpui_do_print_dialog</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>b6ff540cc47781f92bd98d11c609ad96</anchor>
+      <anchor>a50</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>gint</type>
       <name>stpui_compute_orientation</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>25b010dc52c84c5dc5a83b84c4973415</anchor>
+      <anchor>a51</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_dimensions</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>c064fde3bd665a169a5bcee426fe90ad</anchor>
+      <anchor>a52</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>58f2ba3797c5bed1328f2bac2aa71531</anchor>
+      <anchor>a53</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>310705e065d4ae1b3ed2e1c9c5189b1b</anchor>
+      <anchor>a54</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>9475be2668e339e552bf905b3b377697</anchor>
+      <anchor>a55</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>121e36a0905706f7af20b18d76723086</anchor>
+      <anchor>a56</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>881c586fa5ec944b157b7cb92c05be7a</anchor>
+      <anchor>a57</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>e2ae7063801902cb0a4168974d81ab9b</anchor>
+      <anchor>a58</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_thumbnail_data</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>da2af8cf724e3bcbd49be2f5d1cd4bc2</anchor>
+      <anchor>a59</anchor>
       <arglist>(void *)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stpui_get_thumbnail_data</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>eeca67486b0fae3eae3ed8d4c8b6ebe1</anchor>
+      <anchor>a60</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stpui_print</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>7867f0a4ea47e5f9f80c3463e6029a8a</anchor>
+      <anchor>a61</anchor>
       <arglist>(const stpui_plist_t *printer, stpui_image_t *im)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>typebuiltins.h</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprintui2/</path>
+    <path>/home/rlk/sandbox/print-4.3/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>b188f6f607a7c274ff9b93a7b9183c92</anchor>
+      <anchor>a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_TYPE_COMMAND_T</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>c556621db9092f28e345b98cb6db57e3</anchor>
+      <anchor>a1</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_TYPE_CURVE_TYPE</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>fd1aa89f9f88935e1482fa6675a28ee1</anchor>
+      <anchor>a2</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>2c321ec10322da403b1709b4a8956ee3</anchor>
+      <anchor>a3</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>43d1612dab4df6c31f9b5362f88eaadf</anchor>
+      <anchor>a4</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>stpui_curve_type_get_type</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>5e570d0225cd4f8ef426d648293dced9</anchor>
+      <anchor>a5</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
@@ -708,105 +708,105 @@
       <type>GtkDrawingArea</type>
       <name>graph</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>f8b0b924ebd7046dbfa85a856e4682c8</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>cursor_type</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>aeb92d99e85efb4bafc8170ff337d9a5</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>min_x</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>42911f1fe1166d1441b07b5df42cc5c8</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>max_x</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>2cc8505f392b3757b8e289d83c321693</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>min_y</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>6557fd2c11b2f6a56a5ab6bbb85cbc19</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>max_y</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>2c34fcda6babf4933d253ae6cd7c9419</anchor>
+      <anchor>o5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GdkPixmap *</type>
       <name>pixmap</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>8580443f4197aa43eeb23b41f3984de3</anchor>
+      <anchor>o6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>StpuiCurveType</type>
       <name>curve_type</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>a15d0c7b1a08ed0fb3e8675f60ceeb63</anchor>
+      <anchor>o7</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>height</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>b435e227d5dd201e1768b2bcb2e0aa81</anchor>
+      <anchor>o8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>grab_point</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>87568e046fdaaa74725653dc4de489fb</anchor>
+      <anchor>o9</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>last</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>98bd1c45684cf587ac2347a92dd7bb51</anchor>
+      <anchor>o10</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>num_points</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>041da0cf21a17db4fedb8045c0eacdb3</anchor>
+      <anchor>o11</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GdkPoint *</type>
       <name>point</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>78ee54aa8f813885fe2fe20d232518b9</anchor>
+      <anchor>o12</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>num_ctlpoints</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>7268e58fecac8344b32a31da68b341ec</anchor>
+      <anchor>o13</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat(*</type>
       <name>ctlpoint</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>b4de71fdc43c7448028e425034663828</anchor>
+      <anchor>o14</anchor>
       <arglist>)[2]</arglist>
     </member>
   </compound>
@@ -817,42 +817,42 @@
       <type>GtkDrawingAreaClass</type>
       <name>parent_class</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>30b4ac9159b3909d53a2913e9d33ce37</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>curve_type_changed</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>bd4d748a3214fe60405dd0f19071963c</anchor>
+      <anchor>o1</anchor>
       <arglist>)(StpuiCurve *curve)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved1</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>858c3bfbf2316dff67461668960ea424</anchor>
+      <anchor>o2</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved2</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>b98e90cf60128ee094ed5cbec3f7b9bd</anchor>
+      <anchor>o3</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved3</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>3a79f396911263c8c1c03ead4a6feecf</anchor>
+      <anchor>o4</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved4</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>43708b729750b48f02a0273f72cb8947</anchor>
+      <anchor>o5</anchor>
       <arglist>)(void)</arglist>
     </member>
   </compound>
@@ -863,49 +863,49 @@
       <type>GtkVBox</type>
       <name>vbox</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>fad9b4ea6fda50ab90f21ab8d4b6b70c</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>table</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>aab9e1de16f38176f86d7a92ba337a8d</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>curve</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>4efa264f5ef3e1a5c95736e07544ebf0</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>button</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>f40e80ae3d6e7d34a12bf5c9d58c140b</anchor>
+      <anchor>o3</anchor>
       <arglist>[5]</arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>gamma</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>05b048d7242cb7b8b57cfa3b1d65ecea</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>gamma_dialog</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>8dadefcd22adf55ea28403e900b2329e</anchor>
+      <anchor>o5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>gamma_text</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>5b7be56d829006b2914afe741e75a31e</anchor>
+      <anchor>o6</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -916,35 +916,35 @@
       <type>GtkVBoxClass</type>
       <name>parent_class</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>30b4ac9159b3909d53a2913e9d33ce37</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved1</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>858c3bfbf2316dff67461668960ea424</anchor>
+      <anchor>o1</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved2</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>b98e90cf60128ee094ed5cbec3f7b9bd</anchor>
+      <anchor>o2</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved3</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>3a79f396911263c8c1c03ead4a6feecf</anchor>
+      <anchor>o3</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved4</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>43708b729750b48f02a0273f72cb8947</anchor>
+      <anchor>o4</anchor>
       <arglist>)(void)</arglist>
     </member>
   </compound>
@@ -955,56 +955,56 @@
       <type>stp_image_t</type>
       <name>im</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>73bebce395b6f1efedcf6842fbdb4d76</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>transpose</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>2eab557840c9b342f902b27b6f4374c5</anchor>
+      <anchor>o1</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>hflip</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>59c4e5062d0201345d9a3c517faed76b</anchor>
+      <anchor>o2</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>vflip</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>5a79d8a51117f0f542de337737559e35</anchor>
+      <anchor>o3</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_ccw</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>2dd5e7759fa1a528d7d609558f9a3af9</anchor>
+      <anchor>o4</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_cw</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>2f391913505ad8be5f120fdc15083631</anchor>
+      <anchor>o5</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_180</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>38ffe38f14b789767f8a2f7823ad665f</anchor>
+      <anchor>o6</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>crop</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>6746aa4c8378f9674566fbefb37a6aa7</anchor>
+      <anchor>o7</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>b068931cc450442b63f5b3d276ea4297</anchor>
+      <anchor>o0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>command_t</type>
       <name>command_type</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>193b6cc04eadeb71b71417bf19c48c4c</anchor>
+      <anchor>o1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>queue_name</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>692e12dd54ad3badf18627bdb1784843</anchor>
+      <anchor>o2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>extra_printer_options</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>41633c85d02d5b0157efadd6414fa77e</anchor>
+      <anchor>o3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>custom_command</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>4ea7b75bdeda81e50ea3cd316b341f41</anchor>
+      <anchor>o4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>current_standard_command</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>d7d54f45247db317b37d0a4a1b4fc3d2</anchor>
+      <anchor>o5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>output_filename</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>9c39e63596d53eb17161a43fce627940</anchor>
+      <anchor>o6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>float</type>
       <name>scaling</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>0ad29dfafe3dc8ad331b9397912e3d4d</anchor>
+      <anchor>o7</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>orient_t</type>
       <name>orientation</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>da1639422ad8f355d2371428471379b5</anchor>
+      <anchor>o8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>unit</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>3e34bdebd9bd5edda27e8728904a2552</anchor>
+      <anchor>o9</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>auto_size_roll_feed_paper</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>b679b17522d3fbb138dad90635cb91f7</anchor>
+      <anchor>o10</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>invalid_mask</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>01f4a6c8919018e9df44948ed78a5f71</anchor>
+      <anchor>o11</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_vars_t *</type>
       <name>v</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>9e3669d19b675bd57058fd4664205d2a</anchor>
+      <anchor>o12</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="dir">
     <name>include/gutenprintui2/</name>
-    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprintui2/</path>
-    <filename>dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html</filename>
+    <path>/home/rlk/sandbox/print-4.3/include/gutenprintui2/</path>
+    <filename>dir_000001.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/rleigh/gutenprint-debian-dist/include/</path>
-    <filename>dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html</filename>
+    <path>/home/rlk/sandbox/print-4.3/include/</path>
+    <filename>dir_000000.html</filename>
     <dir>include/gutenprintui2/</dir>
   </compound>
 </tagfile>
diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html
index b7d6fbc..03e317a 100644
--- a/doc/gutenprintui2/html/annotated.html
+++ b/doc/gutenprintui2/html/annotated.html
@@ -2,22 +2,9 @@
 <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.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>
+<!-- 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>
 <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>
@@ -26,8 +13,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 Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html
index 523be6c..d1da193 100644
--- a/doc/gutenprintui2/html/classes.html
+++ b/doc/gutenprintui2/html/classes.html
@@ -2,29 +2,16 @@
 <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.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>
+<!-- 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>
 <table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
-<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;
+<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 Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html
index a63afb3..20a76d4 100644
--- a/doc/gutenprintui2/html/curve_8h.html
+++ b/doc/gutenprintui2/html/curve_8h.html
@@ -2,23 +2,11 @@
 <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.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>
+<!-- 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>
 <div class="nav">
-<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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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">
@@ -29,49 +17,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#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#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#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#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#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#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#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#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#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#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#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 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 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#04ae3b4e227fca5f2aa871b0f9e1cab0">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#a6">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#13e6043625efd88837615685f7472e2d">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#a7">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#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>
+<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>
  }</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#3eafd87334a70bb87fca2084b558c2b2">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#a11">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#23667321d3acf52249e8c18506be017d">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#a12">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#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#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#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#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#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#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#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#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#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#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#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>
+<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>
 
 </table>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="767d8cf354306a35dc6b53e2aa033aa6"></a><!-- doxytag: member="curve.h::STPUI_CURVE" ref="767d8cf354306a35dc6b53e2aa033aa6" args="(obj)" --><p>
+<a class="anchor" name="a1"></a><!-- doxytag: member="curve.h::STPUI_CURVE" ref="a1" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -99,7 +87,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9a1005d0077d10338a6a7f16940e8233"></a><!-- doxytag: member="curve.h::STPUI_CURVE_CLASS" ref="9a1005d0077d10338a6a7f16940e8233" args="(klass)" --><p>
+<a class="anchor" name="a2"></a><!-- doxytag: member="curve.h::STPUI_CURVE_CLASS" ref="a2" args="(klass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -127,7 +115,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="5995f171eca6b87af06afde3160fcac0"></a><!-- doxytag: member="curve.h::STPUI_CURVE_GET_CLASS" ref="5995f171eca6b87af06afde3160fcac0" args="(obj)" --><p>
+<a class="anchor" name="a5"></a><!-- doxytag: member="curve.h::STPUI_CURVE_GET_CLASS" ref="a5" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -155,7 +143,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="e886ed1f007a40362f784d16c020ff40"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE" ref="e886ed1f007a40362f784d16c020ff40" args="(obj)" --><p>
+<a class="anchor" name="a3"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE" ref="a3" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -183,7 +171,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="fc44896a3decd9b178cec7f90598c8b8"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE_CLASS" ref="fc44896a3decd9b178cec7f90598c8b8" args="(klass)" --><p>
+<a class="anchor" name="a4"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE_CLASS" ref="a4" args="(klass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -211,7 +199,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="5795444c0586277d34c693fc7b5deae0"></a><!-- doxytag: member="curve.h::STPUI_TYPE_CURVE" ref="5795444c0586277d34c693fc7b5deae0" args="" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="curve.h::STPUI_TYPE_CURVE" ref="a0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -235,7 +223,7 @@
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="04ae3b4e227fca5f2aa871b0f9e1cab0"></a><!-- doxytag: member="curve.h::StpuiCurve" ref="04ae3b4e227fca5f2aa871b0f9e1cab0" args="" --><p>
+<a class="anchor" name="a6"></a><!-- doxytag: member="curve.h::StpuiCurve" ref="a6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -258,7 +246,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="13e6043625efd88837615685f7472e2d"></a><!-- doxytag: member="curve.h::StpuiCurveClass" ref="13e6043625efd88837615685f7472e2d" args="" --><p>
+<a class="anchor" name="a7"></a><!-- doxytag: member="curve.h::StpuiCurveClass" ref="a7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -282,13 +270,13 @@
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="7d44faf53d74002f61d5805ac34d968e"></a><!-- doxytag: member="curve.h::StpuiCurveType" ref="7d44faf53d74002f61d5805ac34d968e" args="" --><p>
+<a class="anchor" name="a19"></a><!-- doxytag: member="curve.h::StpuiCurveType" ref="a19" 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#7d44faf53d74002f61d5805ac34d968e">StpuiCurveType</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="curve_8h.html#a19">StpuiCurveType</a>          </td>
         </tr>
       </table>
     </td>
@@ -304,11 +292,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="7d44faf53d74002f61d5805ac34d968ee32d2131f9b7e70d109be088fcd23297"></a><!-- doxytag: member="STPUI_CURVE_TYPE_LINEAR" ref="7d44faf53d74002f61d5805ac34d968ee32d2131f9b7e70d109be088fcd23297" args="" -->STPUI_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
 </table>
 </dl>
@@ -316,7 +304,7 @@
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="3eafd87334a70bb87fca2084b558c2b2"></a><!-- doxytag: member="curve.h::stpui_curve_get_type" ref="3eafd87334a70bb87fca2084b558c2b2" args="(void) G_GNUC_CONST" --><p>
+<a class="anchor" name="a11"></a><!-- doxytag: member="curve.h::stpui_curve_get_type" ref="a11" args="(void) G_GNUC_CONST" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -344,7 +332,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="6dfbda8721d6d652ef8f710a696d6367"></a><!-- doxytag: member="curve.h::stpui_curve_get_vector" ref="6dfbda8721d6d652ef8f710a696d6367" args="(StpuiCurve *curve, int veclen, gfloat vector[])" --><p>
+<a class="anchor" name="a16"></a><!-- doxytag: member="curve.h::stpui_curve_get_vector" ref="a16" args="(StpuiCurve *curve, int veclen, gfloat vector[])" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -387,7 +375,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="23667321d3acf52249e8c18506be017d"></a><!-- doxytag: member="curve.h::stpui_curve_new" ref="23667321d3acf52249e8c18506be017d" args="(void)" --><p>
+<a class="anchor" name="a12"></a><!-- doxytag: member="curve.h::stpui_curve_new" ref="a12" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -415,7 +403,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="eb1c0e9894aaa04ade62d050aa5ea15b"></a><!-- doxytag: member="curve.h::stpui_curve_reset" ref="eb1c0e9894aaa04ade62d050aa5ea15b" args="(StpuiCurve *curve)" --><p>
+<a class="anchor" name="a13"></a><!-- doxytag: member="curve.h::stpui_curve_reset" ref="a13" args="(StpuiCurve *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -443,7 +431,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9d6d8e461caf28083c2e1b76639c7d24"></a><!-- doxytag: member="curve.h::stpui_curve_set_curve_type" ref="9d6d8e461caf28083c2e1b76639c7d24" args="(StpuiCurve *curve, StpuiCurveType type)" --><p>
+<a class="anchor" name="a18"></a><!-- doxytag: member="curve.h::stpui_curve_set_curve_type" ref="a18" args="(StpuiCurve *curve, StpuiCurveType type)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -457,7 +445,7 @@
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e">StpuiCurveType</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="curve_8h.html#a19">StpuiCurveType</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>type</em></td>
         </tr>
         <tr>
@@ -480,7 +468,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2b8cf1c1a6badf89c3a7b95c87b91a72"></a><!-- doxytag: member="curve.h::stpui_curve_set_gamma" ref="2b8cf1c1a6badf89c3a7b95c87b91a72" args="(StpuiCurve *curve, gfloat gamma_)" --><p>
+<a class="anchor" name="a14"></a><!-- doxytag: member="curve.h::stpui_curve_set_gamma" ref="a14" args="(StpuiCurve *curve, gfloat gamma_)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -517,7 +505,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -572,7 +560,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -615,8 +603,8 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html b/doc/gutenprintui2/html/dir_000000.html
index 648a8ae..f6260ca 100644
--- a/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html
+++ b/doc/gutenprintui2/html/dir_000000.html
@@ -2,26 +2,19 @@
 <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.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>
+<!-- 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>
 <div class="nav">
-<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a></div>
+<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__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.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_000001.html">gutenprintui2</a></td></tr>
 
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html b/doc/gutenprintui2/html/dir_000001.html
index b8901a1..8ca16f0 100644
--- a/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html
+++ b/doc/gutenprintui2/html/dir_000001.html
@@ -2,18 +2,11 @@
 <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.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>
+<!-- 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>
 <div class="nav">
-<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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -26,8 +19,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 Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/dirs.html b/doc/gutenprintui2/html/dirs.html
index d1fcad6..27f7e4b 100644
--- a/doc/gutenprintui2/html/dirs.html
+++ b/doc/gutenprintui2/html/dirs.html
@@ -2,24 +2,17 @@
 <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.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>
+<!-- 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>
 <h1>libgutenprintui2 API Reference Directories</h1>This directory hierarchy is sorted roughly, but not completely, alphabetically:<ul>
-<li><a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>
+<li><a class="el" href="dir_000000.html">include</a>
 <ul>
-<li><a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html">gutenprintui2</a>
+<li><a class="el" href="dir_000001.html">gutenprintui2</a>
 </ul>
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/doxygen.css b/doc/gutenprintui2/html/doxygen.css
index 05615b2..decae9e 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: #e8eef2;
-	border: 1px solid #84b0c7;
+	background-color: #eeeeff;
+	border: 1px solid #b0b0b0;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
@@ -26,16 +26,16 @@ DIV.qindex {
 }
 DIV.nav {
 	width: 100%;
-	background-color: #e8eef2;
-	border: 1px solid #84b0c7;
+	background-color: #eeeeff;
+	border: 1px solid #b0b0b0;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
 	line-height: 140%;
 }
 DIV.navtab {
-       background-color: #e8eef2;
-       border: 1px solid #84b0c7;
+       background-color: #eeeeff;
+       border: 1px solid #b0b0b0;
        text-align: center;
        margin: 2px;
        margin-right: 15px;
@@ -118,7 +118,7 @@ BODY {
 	margin-left: 20px;
 }
 TD.indexkey {
-	background-color: #e8eef2;
+	background-color: #eeeeff;
 	font-weight: bold;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -131,7 +131,7 @@ TD.indexkey {
 	border: 1px solid #CCCCCC;
 }
 TD.indexvalue {
-	background-color: #e8eef2;
+	background-color: #eeeeff;
 	font-style: italic;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -286,25 +286,24 @@ FORM.search {
 INPUT.search { font-size: 75%;
                color: #000080;
                font-weight: normal;
-               background-color: #e8eef2;
+               background-color: #eeeeff;
 }
 TD.tiny      { font-size: 75%;
 }
 a {
-	color: #1A41A8;
+	color: #252E78;
 }
 a:visited {
-	color: #2A3798;
+	color: #3D2185;
 }
 .dirtab { padding: 4px;
           border-collapse: collapse;
-          border: 1px solid #84b0c7;
+          border: 1px solid #b0b0b0;
 }
-TH.dirtab { background: #e8eef2;
+TH.dirtab { background: #eeeeff;
             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 1b7d259..9c8f278 100644
--- a/doc/gutenprintui2/html/files.html
+++ b/doc/gutenprintui2/html/files.html
@@ -2,29 +2,17 @@
 <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.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>
+<!-- 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>
 <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 Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html
index 5a8dcc2..50c3409 100644
--- a/doc/gutenprintui2/html/functions.html
+++ b/doc/gutenprintui2/html/functions.html
@@ -2,144 +2,104 @@
 <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.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>
+<!-- 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>
 
 <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#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>
+: <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>
 <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#b679b17522d3fbb138dad90635cb91f7">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#o10">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#f40e80ae3d6e7d34a12bf5c9d58c140b">_StpuiGammaCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#o3">_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#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>
+: <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>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>extra_printer_options
-: <a class="el" href="structstpui__plist__t.html#41633c85d02d5b0157efadd6414fa77e">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#o3">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#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>
+: <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>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>height
-: <a class="el" href="struct__StpuiCurve.html#b435e227d5dd201e1768b2bcb2e0aa81">_StpuiCurve</a><li>hflip
-: <a class="el" href="structstpui__image.html#59c4e5062d0201345d9a3c517faed76b">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#o8">_StpuiCurve</a><li>hflip
+: <a class="el" href="structstpui__image.html#o2">stpui_image</a></ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>im
-: <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>
+: <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>
 <h3><a class="anchor" name="index_l">- l -</a></h3><ul>
 <li>last
-: <a class="el" href="struct__StpuiCurve.html#98bd1c45684cf587ac2347a92dd7bb51">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#o10">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>max_x
-: <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>
+: <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>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <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>
+: <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>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>orientation
-: <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>
+: <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>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>parent_class
-: <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>
+: <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>
 <h3><a class="anchor" name="index_q">- q -</a></h3><ul>
 <li>queue_name
-: <a class="el" href="structstpui__plist__t.html#692e12dd54ad3badf18627bdb1784843">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#o2">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#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>
+: <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>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>scaling
-: <a class="el" href="structstpui__plist__t.html#0ad29dfafe3dc8ad331b9397912e3d4d">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#o7">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#aab9e1de16f38176f86d7a92ba337a8d">_StpuiGammaCurve</a><li>transpose
-: <a class="el" href="structstpui__image.html#2eab557840c9b342f902b27b6f4374c5">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#o1">_StpuiGammaCurve</a><li>transpose
+: <a class="el" href="structstpui__image.html#o1">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#3e34bdebd9bd5edda27e8728904a2552">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#o9">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#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 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 Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html
index 0682e40..cfe2602 100644
--- a/doc/gutenprintui2/html/functions_vars.html
+++ b/doc/gutenprintui2/html/functions_vars.html
@@ -2,144 +2,104 @@
 <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.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>
+<!-- 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>
 
 <p>
-&nbsp;
+
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_gtk_reserved1
-: <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>
+: <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>
 <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#b679b17522d3fbb138dad90635cb91f7">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#o10">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#f40e80ae3d6e7d34a12bf5c9d58c140b">_StpuiGammaCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#o3">_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#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>
+: <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>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>extra_printer_options
-: <a class="el" href="structstpui__plist__t.html#41633c85d02d5b0157efadd6414fa77e">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#o3">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#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>
+: <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>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>height
-: <a class="el" href="struct__StpuiCurve.html#b435e227d5dd201e1768b2bcb2e0aa81">_StpuiCurve</a><li>hflip
-: <a class="el" href="structstpui__image.html#59c4e5062d0201345d9a3c517faed76b">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#o8">_StpuiCurve</a><li>hflip
+: <a class="el" href="structstpui__image.html#o2">stpui_image</a></ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>im
-: <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>
+: <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>
 <h3><a class="anchor" name="index_l">- l -</a></h3><ul>
 <li>last
-: <a class="el" href="struct__StpuiCurve.html#98bd1c45684cf587ac2347a92dd7bb51">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#o10">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>max_x
-: <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>
+: <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>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <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>
+: <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>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>orientation
-: <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>
+: <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>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>parent_class
-: <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>
+: <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>
 <h3><a class="anchor" name="index_q">- q -</a></h3><ul>
 <li>queue_name
-: <a class="el" href="structstpui__plist__t.html#692e12dd54ad3badf18627bdb1784843">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#o2">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#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>
+: <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>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>scaling
-: <a class="el" href="structstpui__plist__t.html#0ad29dfafe3dc8ad331b9397912e3d4d">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#o7">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#aab9e1de16f38176f86d7a92ba337a8d">_StpuiGammaCurve</a><li>transpose
-: <a class="el" href="structstpui__image.html#2eab557840c9b342f902b27b6f4374c5">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#o1">_StpuiGammaCurve</a><li>transpose
+: <a class="el" href="structstpui__image.html#o1">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#3e34bdebd9bd5edda27e8728904a2552">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#o9">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#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 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 Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html
index ceb94e0..d4e89e0 100644
--- a/doc/gutenprintui2/html/gammacurve_8h.html
+++ b/doc/gutenprintui2/html/gammacurve_8h.html
@@ -2,23 +2,11 @@
 <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.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>
+<!-- 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>
 <div class="nav">
-<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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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">
@@ -29,31 +17,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#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#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#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#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#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#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#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#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#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#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#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 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 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#e112dc0cc75594e7e8efd332fe2c9c5b">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#a6">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#4ab4956b6af215068a2592a98ae43cbc">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#a7">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#57a0864588671f9b1ed5a64be3a06ed5">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#a8">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#b3038f4fe63c6035e3f1ec876559d8f9">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#a9">stpui_gamma_curve_new</a> (void)</td></tr>
 
 </table>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="679501caed595f5d700271b9991b724f"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE" ref="679501caed595f5d700271b9991b724f" args="(obj)" --><p>
+<a class="anchor" name="a1"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE" ref="a1" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -81,7 +69,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="8272afcf9ea42c3823c2d201fa13ba39"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_CLASS" ref="8272afcf9ea42c3823c2d201fa13ba39" args="(klass)" --><p>
+<a class="anchor" name="a2"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_CLASS" ref="a2" args="(klass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -109,7 +97,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9d8fed0608357a55c11c5adba1f6d1b5"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_GET_CLASS" ref="9d8fed0608357a55c11c5adba1f6d1b5" args="(obj)" --><p>
+<a class="anchor" name="a5"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_GET_CLASS" ref="a5" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -137,7 +125,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="3838127029e05b8b71b4bb177ae8212e"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE" ref="3838127029e05b8b71b4bb177ae8212e" args="(obj)" --><p>
+<a class="anchor" name="a3"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE" ref="a3" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -165,7 +153,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="c574b30d0e65b8f5f6cd110405cbe9fb"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE_CLASS" ref="c574b30d0e65b8f5f6cd110405cbe9fb" args="(klass)" --><p>
+<a class="anchor" name="a4"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE_CLASS" ref="a4" args="(klass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -193,7 +181,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2575918538735bd891f2e4d9ec05d7b1"></a><!-- doxytag: member="gammacurve.h::STPUI_TYPE_GAMMA_CURVE" ref="2575918538735bd891f2e4d9ec05d7b1" args="" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="gammacurve.h::STPUI_TYPE_GAMMA_CURVE" ref="a0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -217,7 +205,7 @@
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="e112dc0cc75594e7e8efd332fe2c9c5b"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurve" ref="e112dc0cc75594e7e8efd332fe2c9c5b" args="" --><p>
+<a class="anchor" name="a6"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurve" ref="a6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -240,7 +228,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="4ab4956b6af215068a2592a98ae43cbc"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurveClass" ref="4ab4956b6af215068a2592a98ae43cbc" args="" --><p>
+<a class="anchor" name="a7"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurveClass" ref="a7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -264,7 +252,7 @@
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="57a0864588671f9b1ed5a64be3a06ed5"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_get_type" ref="57a0864588671f9b1ed5a64be3a06ed5" args="(void) G_GNUC_CONST" --><p>
+<a class="anchor" name="a8"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_get_type" ref="a8" args="(void) G_GNUC_CONST" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -292,7 +280,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b3038f4fe63c6035e3f1ec876559d8f9"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_new" ref="b3038f4fe63c6035e3f1ec876559d8f9" args="(void)" --><p>
+<a class="anchor" name="a9"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_new" ref="a9" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -320,8 +308,8 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html
index f488173..bc6c2d0 100644
--- a/doc/gutenprintui2/html/globals.html
+++ b/doc/gutenprintui2/html/globals.html
@@ -2,153 +2,125 @@
 <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.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>
+<!-- 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>
 
 <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#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>
+: <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>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_thumbnail_func_t
-: <a class="el" href="gutenprintui_8h.html#6867fbda8dc5650678af5a23979386b8">gutenprintui.h</a></ul>
+: <a class="el" href="gutenprintui_8h.html#a1">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#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>
+: <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>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stpui_build_standard_print_command()
-: <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 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 Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html
index 8c0a90a..8564647 100644
--- a/doc/gutenprintui2/html/globals_defs.html
+++ b/doc/gutenprintui2/html/globals_defs.html
@@ -2,52 +2,31 @@
 <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.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;
+<!-- 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>
+
 <p>
 <ul>
 <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_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 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 Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html
index 0b2948e..36b9578 100644
--- a/doc/gutenprintui2/html/globals_enum.html
+++ b/doc/gutenprintui2/html/globals_enum.html
@@ -2,40 +2,19 @@
 <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.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;
+<!-- 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>
+
 <p>
 <ul>
 <li>command_t
-: <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 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 Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html
index 789cb12..9538097 100644
--- a/doc/gutenprintui2/html/globals_eval.html
+++ b/doc/gutenprintui2/html/globals_eval.html
@@ -2,48 +2,27 @@
 <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.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;
+<!-- 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>
+
 <p>
 <ul>
 <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><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 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 Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html
index 79bbc94..47630b0 100644
--- a/doc/gutenprintui2/html/globals_func.html
+++ b/doc/gutenprintui2/html/globals_func.html
@@ -2,115 +2,88 @@
 <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.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>
+<!-- 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>
 
 <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#43d1612dab4df6c31f9b5362f88eaadf">typebuiltins.h</a></ul>
+: <a class="el" href="typebuiltins_8h.html#a4">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#2c321ec10322da403b1709b4a8956ee3">typebuiltins.h</a></ul>
+: <a class="el" href="typebuiltins_8h.html#a3">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#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 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 Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html
index 57e05c8..70ab98e 100644
--- a/doc/gutenprintui2/html/globals_type.html
+++ b/doc/gutenprintui2/html/globals_type.html
@@ -2,43 +2,22 @@
 <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.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;
+<!-- 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>
+
 <p>
 <ul>
 <li>get_thumbnail_func_t
-: <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 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 Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html
index 697624b..0bc9549 100644
--- a/doc/gutenprintui2/html/gutenprintui_8h.html
+++ b/doc/gutenprintui2/html/gutenprintui_8h.html
@@ -2,23 +2,11 @@
 <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.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>
+<!-- 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>
 <div class="nav">
-<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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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>
@@ -32,140 +20,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#f0f2e236d924323378ded67b3e434dd5">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#a0">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#6867fbda8dc5650678af5a23979386b8">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#a1">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#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, 
+<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, 
 <br>
-&nbsp;&nbsp;<a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581">ORIENT_SEASCAPE</a> =  3
+&nbsp;&nbsp;<a class="el" href="gutenprintui_8h.html#a62a6">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#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>
+<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>
  }</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#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#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#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">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">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">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">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#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#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">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">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">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">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#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#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">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">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">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">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#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#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">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">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">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">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#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#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">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">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">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">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">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">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">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">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#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#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">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">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">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">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">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"><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"><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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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">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#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#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#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#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#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#849dc9d8235aeae8c294ea97d3a2291d">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#a44">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#b46b5187c4d36188019c556f8685efdc">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#a45">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#cedc4d703e8a6e88243241245748a144">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#a46">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#92ac2b023b0352cb3d519ece77ccc51c">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#a47">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#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#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#1280f5bad08d4f7ccbfbd64785102ce2">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#a49">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#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#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#25b010dc52c84c5dc5a83b84c4973415">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#a51">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#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#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#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#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#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#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#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#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#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#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#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">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"><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"><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">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#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#eeca67486b0fae3eae3ed8d4c8b6ebe1">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#a60">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#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>
+<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>
 
 </table>
 <hr><h2>Typedef Documentation</h2>
-<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>
+<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>
 <table 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#6867fbda8dc5650678af5a23979386b8">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#a1">get_thumbnail_func_t</a>)(void *data, gint *width, gint *height, gint *bpp, gint page)          </td>
         </tr>
       </table>
     </td>
@@ -182,7 +170,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="f0f2e236d924323378ded67b3e434dd5"></a><!-- doxytag: member="gutenprintui.h::stpui_image_t" ref="f0f2e236d924323378ded67b3e434dd5" args="" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="gutenprintui.h::stpui_image_t" ref="a0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -206,13 +194,13 @@
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="1d9b1ad69ddba33dc7f51bf85792777d"></a><!-- doxytag: member="gutenprintui.h::command_t" ref="1d9b1ad69ddba33dc7f51bf85792777d" args="" --><p>
+<a class="anchor" name="a63"></a><!-- doxytag: member="gutenprintui.h::command_t" ref="a63" 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#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="gutenprintui_8h.html#a63">command_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -228,24 +216,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="1d9b1ad69ddba33dc7f51bf85792777de8968fd1ea61243b41d783dc1a8a3bfb"></a><!-- doxytag: member="COMMAND_TYPE_DEFAULT" ref="1d9b1ad69ddba33dc7f51bf85792777de8968fd1ea61243b41d783dc1a8a3bfb" args="" -->COMMAND_TYPE_DEFAULT</em>&nbsp;</td><td>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
-<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>
+<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>
 </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f29593"></a><!-- doxytag: member="gutenprintui.h::orient_t" ref="b72dd018d9f09ee35f7ac40fc7f29593" args="" --><p>
+<a class="anchor" name="a62"></a><!-- doxytag: member="gutenprintui.h::orient_t" ref="a62" 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#b72dd018d9f09ee35f7ac40fc7f29593">orient_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="gutenprintui_8h.html#a62">orient_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -261,15 +249,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="b72dd018d9f09ee35f7ac40fc7f29593c90c0226859f895bd60176c7d414e4f0"></a><!-- doxytag: member="ORIENT_AUTO" ref="b72dd018d9f09ee35f7ac40fc7f29593c90c0226859f895bd60176c7d414e4f0" args="" -->ORIENT_AUTO</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="a62a2"></a><!-- doxytag: member="ORIENT_AUTO" ref="a62a2" args="" -->ORIENT_AUTO</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f295939e273eeca1c05d1a25e93ea977149f80"></a><!-- doxytag: member="ORIENT_PORTRAIT" ref="b72dd018d9f09ee35f7ac40fc7f295939e273eeca1c05d1a25e93ea977149f80" args="" -->ORIENT_PORTRAIT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="a62a3"></a><!-- doxytag: member="ORIENT_PORTRAIT" ref="a62a3" args="" -->ORIENT_PORTRAIT</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f2959329a34c1af72e3dc2ccdea5213fe5adba"></a><!-- doxytag: member="ORIENT_LANDSCAPE" ref="b72dd018d9f09ee35f7ac40fc7f2959329a34c1af72e3dc2ccdea5213fe5adba" args="" -->ORIENT_LANDSCAPE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="a62a4"></a><!-- doxytag: member="ORIENT_LANDSCAPE" ref="a62a4" args="" -->ORIENT_LANDSCAPE</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f2959344c3bb5aa3e545544bcce606de1d8b88"></a><!-- doxytag: member="ORIENT_UPSIDEDOWN" ref="b72dd018d9f09ee35f7ac40fc7f2959344c3bb5aa3e545544bcce606de1d8b88" args="" -->ORIENT_UPSIDEDOWN</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="a62a5"></a><!-- doxytag: member="ORIENT_UPSIDEDOWN" ref="a62a5" args="" -->ORIENT_UPSIDEDOWN</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581"></a><!-- doxytag: member="ORIENT_SEASCAPE" ref="b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581" args="" -->ORIENT_SEASCAPE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="a62a6"></a><!-- doxytag: member="ORIENT_SEASCAPE" ref="a62a6" args="" -->ORIENT_SEASCAPE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
@@ -277,7 +265,7 @@
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -314,7 +302,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="25b010dc52c84c5dc5a83b84c4973415"></a><!-- doxytag: member="gutenprintui.h::stpui_compute_orientation" ref="25b010dc52c84c5dc5a83b84c4973415" args="(void)" --><p>
+<a class="anchor" name="a51"></a><!-- doxytag: member="gutenprintui.h::stpui_compute_orientation" ref="a51" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -342,7 +330,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b6ff540cc47781f92bd98d11c609ad96"></a><!-- doxytag: member="gutenprintui.h::stpui_do_print_dialog" ref="b6ff540cc47781f92bd98d11c609ad96" args="(void)" --><p>
+<a class="anchor" name="a50"></a><!-- doxytag: member="gutenprintui.h::stpui_do_print_dialog" ref="a50" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -370,7 +358,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="8aa89d084c3364396974b7665f5a26f9"></a><!-- doxytag: member="gutenprintui.h::stpui_get_current_printer" ref="8aa89d084c3364396974b7665f5a26f9" args="(void)" --><p>
+<a class="anchor" name="a37"></a><!-- doxytag: member="gutenprintui.h::stpui_get_current_printer" ref="a37" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -398,7 +386,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="1280f5bad08d4f7ccbfbd64785102ce2"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errdata" ref="1280f5bad08d4f7ccbfbd64785102ce2" args="(void)" --><p>
+<a class="anchor" name="a49"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errdata" ref="a49" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -426,7 +414,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="92ac2b023b0352cb3d519ece77ccc51c"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errfunc" ref="92ac2b023b0352cb3d519ece77ccc51c" args="(void)" --><p>
+<a class="anchor" name="a47"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errfunc" ref="a47" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -454,7 +442,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="51decc80a312291c9f99cde8a18393a6"></a><!-- doxytag: member="gutenprintui.h::stpui_get_global_parameter" ref="51decc80a312291c9f99cde8a18393a6" args="(const char *param)" --><p>
+<a class="anchor" name="a33"></a><!-- doxytag: member="gutenprintui.h::stpui_get_global_parameter" ref="a33" args="(const char *param)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -482,7 +470,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b46b5187c4d36188019c556f8685efdc"></a><!-- doxytag: member="gutenprintui.h::stpui_get_image_filename" ref="b46b5187c4d36188019c556f8685efdc" args="(void)" --><p>
+<a class="anchor" name="a45"></a><!-- doxytag: member="gutenprintui.h::stpui_get_image_filename" ref="a45" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -510,7 +498,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="47f72a1bf50eac641ab4f72af5ed379f"></a><!-- doxytag: member="gutenprintui.h::stpui_get_printrc_file" ref="47f72a1bf50eac641ab4f72af5ed379f" args="(void)" --><p>
+<a class="anchor" name="a40"></a><!-- doxytag: member="gutenprintui.h::stpui_get_printrc_file" ref="a40" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -538,7 +526,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="35da543417b8be45c11c02c590bf4ef5"></a><!-- doxytag: member="gutenprintui.h::stpui_get_system_printers" ref="35da543417b8be45c11c02c590bf4ef5" args="(void)" --><p>
+<a class="anchor" name="a42"></a><!-- doxytag: member="gutenprintui.h::stpui_get_system_printers" ref="a42" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -566,7 +554,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="eeca67486b0fae3eae3ed8d4c8b6ebe1"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_data" ref="eeca67486b0fae3eae3ed8d4c8b6ebe1" args="(void)" --><p>
+<a class="anchor" name="a60"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_data" ref="a60" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -594,13 +582,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="e2ae7063801902cb0a4168974d81ab9b"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_func" ref="e2ae7063801902cb0a4168974d81ab9b" args="(void)" --><p>
+<a class="anchor" name="a58"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_func" ref="a58" 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#6867fbda8dc5650678af5a23979386b8">get_thumbnail_func_t</a> stpui_get_thumbnail_func           </td>
+          <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" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -622,7 +610,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -659,7 +647,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -696,13 +684,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2f5b046cd01c6ad5bbccd485165928d7"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_command_type" ref="2f5b046cd01c6ad5bbccd485165928d7" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="a31"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_command_type" ref="a31" 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#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a> stpui_plist_get_command_type           </td>
+          <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" 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>
@@ -724,7 +712,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="4effa689c6a5e828c672b3feb0c91623"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_copy_count" ref="4effa689c6a5e828c672b3feb0c91623" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="a26"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_copy_count" ref="a26" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -752,7 +740,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -780,7 +768,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b31d172f0c6755ac149b498800c46141"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_custom_command" ref="b31d172f0c6755ac149b498800c46141" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="a24"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_custom_command" ref="a24" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -808,7 +796,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -836,7 +824,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="c70ee1c3425b1a3be74a5dfc3476f079"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_name" ref="c70ee1c3425b1a3be74a5dfc3476f079" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="a12"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_name" ref="a12" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -864,7 +852,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="f593816f98fad12bf48d461fe72ff31e"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_output_filename" ref="f593816f98fad12bf48d461fe72ff31e" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="a18"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_output_filename" ref="a18" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -892,7 +880,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="aecb54cd0535976fd51b2be080366c22"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_queue_name" ref="aecb54cd0535976fd51b2be080366c22" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="a15"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_queue_name" ref="a15" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -920,7 +908,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -934,7 +922,7 @@
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="gutenprintui_8h.html#a63">command_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>val</em></td>
         </tr>
         <tr>
@@ -957,7 +945,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -994,7 +982,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1031,7 +1019,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1074,7 +1062,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1111,7 +1099,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1154,7 +1142,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1191,7 +1179,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1234,7 +1222,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1271,7 +1259,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1314,7 +1302,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1351,7 +1339,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1394,7 +1382,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1431,7 +1419,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1474,7 +1462,7 @@
     </td>
   </tr>
 </table>
-<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>
+<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>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1511,7 +1499,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="63325efb553d690c83608ad9d75b9c5c"></a><!-- doxytag: member="gutenprintui.h::stpui_printer_initialize" ref="63325efb553d690c83608ad9d75b9c5c" args="(stpui_plist_t *printer)" --><p>
+<a class="anchor" name="a36"></a><!-- doxytag: member="gutenprintui.h::stpui_printer_initialize" ref="a36" args="(stpui_plist_t *printer)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1539,7 +1527,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9768d9e8d5370bdd66710de1df8fe4d3"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_load" ref="9768d9e8d5370bdd66710de1df8fe4d3" args="(void)" --><p>
+<a class="anchor" name="a41"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_load" ref="a41" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1567,7 +1555,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="ea786257cd4a43a3ab947eb09d19907c"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_save" ref="ea786257cd4a43a3ab947eb09d19907c" args="(void)" --><p>
+<a class="anchor" name="a43"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_save" ref="a43" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1595,7 +1583,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="6bc23edc145044cffc5f9457f759523e"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errdata" ref="6bc23edc145044cffc5f9457f759523e" args="(void *errdata)" --><p>
+<a class="anchor" name="a48"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errdata" ref="a48" args="(void *errdata)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1623,7 +1611,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="cedc4d703e8a6e88243241245748a144"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errfunc" ref="cedc4d703e8a6e88243241245748a144" args="(stp_outfunc_t wfunc)" --><p>
+<a class="anchor" name="a46"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errfunc" ref="a46" args="(stp_outfunc_t wfunc)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1651,7 +1639,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="35603794767eb756a784a74220e2e0cb"></a><!-- doxytag: member="gutenprintui.h::stpui_set_global_parameter" ref="35603794767eb756a784a74220e2e0cb" args="(const char *param, const char *value)" --><p>
+<a class="anchor" name="a32"></a><!-- doxytag: member="gutenprintui.h::stpui_set_global_parameter" ref="a32" args="(const char *param, const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1688,7 +1676,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="121e36a0905706f7af20b18d76723086"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_channel_depth" ref="121e36a0905706f7af20b18d76723086" args="(gint bit_depth)" --><p>
+<a class="anchor" name="a56"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_channel_depth" ref="a56" args="(gint bit_depth)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1716,7 +1704,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="c064fde3bd665a169a5bcee426fe90ad"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_dimensions" ref="c064fde3bd665a169a5bcee426fe90ad" args="(gint width, gint height)" --><p>
+<a class="anchor" name="a52"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_dimensions" ref="a52" args="(gint width, gint height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1753,7 +1741,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="849dc9d8235aeae8c294ea97d3a2291d"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_filename" ref="849dc9d8235aeae8c294ea97d3a2291d" args="(const char *)" --><p>
+<a class="anchor" name="a44"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_filename" ref="a44" args="(const char *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1781,7 +1769,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9475be2668e339e552bf905b3b377697"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_raw_channels" ref="9475be2668e339e552bf905b3b377697" args="(gint channels)" --><p>
+<a class="anchor" name="a55"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_raw_channels" ref="a55" args="(gint channels)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1809,7 +1797,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="58f2ba3797c5bed1328f2bac2aa71531"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_resolution" ref="58f2ba3797c5bed1328f2bac2aa71531" args="(gdouble xres, gdouble yres)" --><p>
+<a class="anchor" name="a53"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_resolution" ref="a53" args="(gdouble xres, gdouble yres)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1846,7 +1834,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="310705e065d4ae1b3ed2e1c9c5189b1b"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_type" ref="310705e065d4ae1b3ed2e1c9c5189b1b" args="(const char *image_type)" --><p>
+<a class="anchor" name="a54"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_type" ref="a54" args="(const char *image_type)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1874,7 +1862,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="98928c6f53a0322dad08f1057882b2fd"></a><!-- doxytag: member="gutenprintui.h::stpui_set_printrc_file" ref="98928c6f53a0322dad08f1057882b2fd" args="(const char *name)" --><p>
+<a class="anchor" name="a39"></a><!-- doxytag: member="gutenprintui.h::stpui_set_printrc_file" ref="a39" args="(const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1902,7 +1890,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="da2af8cf724e3bcbd49be2f5d1cd4bc2"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_data" ref="da2af8cf724e3bcbd49be2f5d1cd4bc2" args="(void *)" --><p>
+<a class="anchor" name="a59"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_data" ref="a59" args="(void *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1930,7 +1918,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="881c586fa5ec944b157b7cb92c05be7a"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_func" ref="881c586fa5ec944b157b7cb92c05be7a" args="(get_thumbnail_func_t)" --><p>
+<a class="anchor" name="a57"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_func" ref="a57" args="(get_thumbnail_func_t)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1938,7 +1926,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#6867fbda8dc5650678af5a23979386b8">get_thumbnail_func_t</a>&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="mdname1" valign="top" nowrap>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1958,8 +1946,8 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html
index 50eaff3..fbf5b32 100644
--- a/doc/gutenprintui2/html/index.html
+++ b/doc/gutenprintui2/html/index.html
@@ -2,20 +2,13 @@
 <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.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>
+<!-- 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>
 <h1>libgutenprintui2 API Reference Documentation</h1>
 <p>
-<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;
+<h3 align="center">5.0.0-rc2 </h3><hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html
index f5ec280..9b3c867 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurve.html
@@ -2,66 +2,53 @@
 <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.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>
+<!-- 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>
 <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#f8b0b924ebd7046dbfa85a856e4682c8">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#o0">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#aeb92d99e85efb4bafc8170ff337d9a5">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#o1">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#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#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#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#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#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#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#2c34fcda6babf4933d253ae6cd7c9419">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#o5">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#8580443f4197aa43eeb23b41f3984de3">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#o6">pixmap</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"><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">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#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#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#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#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#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#041da0cf21a17db4fedb8045c0eacdb3">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#o11">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#78ee54aa8f813885fe2fe20d232518b9">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#o12">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#7268e58fecac8344b32a31da68b341ec">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#o13">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#b4de71fdc43c7448028e425034663828">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#o14">ctlpoint</a> )[2]</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="b4de71fdc43c7448028e425034663828"></a><!-- doxytag: member="_StpuiCurve::ctlpoint" ref="b4de71fdc43c7448028e425034663828" args=")[2]" --><p>
+<a class="anchor" name="o14"></a><!-- doxytag: member="_StpuiCurve::ctlpoint" ref="o14" 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#b4de71fdc43c7448028e425034663828">_StpuiCurve::ctlpoint</a>)[2]          </td>
+          <td class="md" nowrap valign="top">gfloat(* <a class="el" href="struct__StpuiCurve.html#o14">_StpuiCurve::ctlpoint</a>)[2]          </td>
         </tr>
       </table>
     </td>
@@ -78,13 +65,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="aeb92d99e85efb4bafc8170ff337d9a5"></a><!-- doxytag: member="_StpuiCurve::cursor_type" ref="aeb92d99e85efb4bafc8170ff337d9a5" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiCurve::cursor_type" ref="o1" 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#aeb92d99e85efb4bafc8170ff337d9a5">_StpuiCurve::cursor_type</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o1">_StpuiCurve::cursor_type</a>          </td>
         </tr>
       </table>
     </td>
@@ -101,13 +88,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a15d0c7b1a08ed0fb3e8675f60ceeb63"></a><!-- doxytag: member="_StpuiCurve::curve_type" ref="a15d0c7b1a08ed0fb3e8675f60ceeb63" args="" --><p>
+<a class="anchor" name="o7"></a><!-- doxytag: member="_StpuiCurve::curve_type" ref="o7" 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#7d44faf53d74002f61d5805ac34d968e">StpuiCurveType</a> <a class="el" href="struct__StpuiCurve.html#a15d0c7b1a08ed0fb3e8675f60ceeb63">_StpuiCurve::curve_type</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -124,13 +111,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="87568e046fdaaa74725653dc4de489fb"></a><!-- doxytag: member="_StpuiCurve::grab_point" ref="87568e046fdaaa74725653dc4de489fb" args="" --><p>
+<a class="anchor" name="o9"></a><!-- doxytag: member="_StpuiCurve::grab_point" ref="o9" 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#87568e046fdaaa74725653dc4de489fb">_StpuiCurve::grab_point</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o9">_StpuiCurve::grab_point</a>          </td>
         </tr>
       </table>
     </td>
@@ -147,13 +134,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="f8b0b924ebd7046dbfa85a856e4682c8"></a><!-- doxytag: member="_StpuiCurve::graph" ref="f8b0b924ebd7046dbfa85a856e4682c8" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiCurve::graph" ref="o0" 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#f8b0b924ebd7046dbfa85a856e4682c8">_StpuiCurve::graph</a>          </td>
+          <td class="md" nowrap valign="top">GtkDrawingArea <a class="el" href="struct__StpuiCurve.html#o0">_StpuiCurve::graph</a>          </td>
         </tr>
       </table>
     </td>
@@ -170,13 +157,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b435e227d5dd201e1768b2bcb2e0aa81"></a><!-- doxytag: member="_StpuiCurve::height" ref="b435e227d5dd201e1768b2bcb2e0aa81" args="" --><p>
+<a class="anchor" name="o8"></a><!-- doxytag: member="_StpuiCurve::height" ref="o8" 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#b435e227d5dd201e1768b2bcb2e0aa81">_StpuiCurve::height</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o8">_StpuiCurve::height</a>          </td>
         </tr>
       </table>
     </td>
@@ -193,13 +180,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="98bd1c45684cf587ac2347a92dd7bb51"></a><!-- doxytag: member="_StpuiCurve::last" ref="98bd1c45684cf587ac2347a92dd7bb51" args="" --><p>
+<a class="anchor" name="o10"></a><!-- doxytag: member="_StpuiCurve::last" ref="o10" 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#98bd1c45684cf587ac2347a92dd7bb51">_StpuiCurve::last</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o10">_StpuiCurve::last</a>          </td>
         </tr>
       </table>
     </td>
@@ -216,13 +203,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2cc8505f392b3757b8e289d83c321693"></a><!-- doxytag: member="_StpuiCurve::max_x" ref="2cc8505f392b3757b8e289d83c321693" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiCurve::max_x" ref="o3" 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#2cc8505f392b3757b8e289d83c321693">_StpuiCurve::max_x</a>          </td>
+          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o3">_StpuiCurve::max_x</a>          </td>
         </tr>
       </table>
     </td>
@@ -239,13 +226,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2c34fcda6babf4933d253ae6cd7c9419"></a><!-- doxytag: member="_StpuiCurve::max_y" ref="2c34fcda6babf4933d253ae6cd7c9419" args="" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="_StpuiCurve::max_y" ref="o5" 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#2c34fcda6babf4933d253ae6cd7c9419">_StpuiCurve::max_y</a>          </td>
+          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o5">_StpuiCurve::max_y</a>          </td>
         </tr>
       </table>
     </td>
@@ -262,13 +249,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="42911f1fe1166d1441b07b5df42cc5c8"></a><!-- doxytag: member="_StpuiCurve::min_x" ref="42911f1fe1166d1441b07b5df42cc5c8" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiCurve::min_x" ref="o2" 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#42911f1fe1166d1441b07b5df42cc5c8">_StpuiCurve::min_x</a>          </td>
+          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o2">_StpuiCurve::min_x</a>          </td>
         </tr>
       </table>
     </td>
@@ -285,13 +272,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="6557fd2c11b2f6a56a5ab6bbb85cbc19"></a><!-- doxytag: member="_StpuiCurve::min_y" ref="6557fd2c11b2f6a56a5ab6bbb85cbc19" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiCurve::min_y" ref="o4" 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#6557fd2c11b2f6a56a5ab6bbb85cbc19">_StpuiCurve::min_y</a>          </td>
+          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o4">_StpuiCurve::min_y</a>          </td>
         </tr>
       </table>
     </td>
@@ -308,13 +295,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="7268e58fecac8344b32a31da68b341ec"></a><!-- doxytag: member="_StpuiCurve::num_ctlpoints" ref="7268e58fecac8344b32a31da68b341ec" args="" --><p>
+<a class="anchor" name="o13"></a><!-- doxytag: member="_StpuiCurve::num_ctlpoints" ref="o13" 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#7268e58fecac8344b32a31da68b341ec">_StpuiCurve::num_ctlpoints</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o13">_StpuiCurve::num_ctlpoints</a>          </td>
         </tr>
       </table>
     </td>
@@ -331,13 +318,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="041da0cf21a17db4fedb8045c0eacdb3"></a><!-- doxytag: member="_StpuiCurve::num_points" ref="041da0cf21a17db4fedb8045c0eacdb3" args="" --><p>
+<a class="anchor" name="o11"></a><!-- doxytag: member="_StpuiCurve::num_points" ref="o11" 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#041da0cf21a17db4fedb8045c0eacdb3">_StpuiCurve::num_points</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o11">_StpuiCurve::num_points</a>          </td>
         </tr>
       </table>
     </td>
@@ -354,13 +341,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="8580443f4197aa43eeb23b41f3984de3"></a><!-- doxytag: member="_StpuiCurve::pixmap" ref="8580443f4197aa43eeb23b41f3984de3" args="" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="_StpuiCurve::pixmap" ref="o6" 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#8580443f4197aa43eeb23b41f3984de3">_StpuiCurve::pixmap</a>          </td>
+          <td class="md" nowrap valign="top">GdkPixmap* <a class="el" href="struct__StpuiCurve.html#o6">_StpuiCurve::pixmap</a>          </td>
         </tr>
       </table>
     </td>
@@ -377,13 +364,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="78ee54aa8f813885fe2fe20d232518b9"></a><!-- doxytag: member="_StpuiCurve::point" ref="78ee54aa8f813885fe2fe20d232518b9" args="" --><p>
+<a class="anchor" name="o12"></a><!-- doxytag: member="_StpuiCurve::point" ref="o12" 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#78ee54aa8f813885fe2fe20d232518b9">_StpuiCurve::point</a>          </td>
+          <td class="md" nowrap valign="top">GdkPoint* <a class="el" href="struct__StpuiCurve.html#o12">_StpuiCurve::point</a>          </td>
         </tr>
       </table>
     </td>
@@ -402,8 +389,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 Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
index 7f80bdc..6918bf9 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
@@ -2,48 +2,35 @@
 <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.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>
+<!-- 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>
 <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#30b4ac9159b3909d53a2913e9d33ce37">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#o0">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#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#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#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#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#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#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#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#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#43708b729750b48f02a0273f72cb8947">_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#o5">_gtk_reserved4</a> )(void)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="858c3bfbf2316dff67461668960ea424"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved1" ref="858c3bfbf2316dff67461668960ea424" args=")(void)" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved1" ref="o2" 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#858c3bfbf2316dff67461668960ea424">_StpuiCurveClass::_gtk_reserved1</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o2">_StpuiCurveClass::_gtk_reserved1</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -60,13 +47,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b98e90cf60128ee094ed5cbec3f7b9bd"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved2" ref="b98e90cf60128ee094ed5cbec3f7b9bd" args=")(void)" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved2" ref="o3" 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#b98e90cf60128ee094ed5cbec3f7b9bd">_StpuiCurveClass::_gtk_reserved2</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o3">_StpuiCurveClass::_gtk_reserved2</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -83,13 +70,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="3a79f396911263c8c1c03ead4a6feecf"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved3" ref="3a79f396911263c8c1c03ead4a6feecf" args=")(void)" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved3" ref="o4" 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#3a79f396911263c8c1c03ead4a6feecf">_StpuiCurveClass::_gtk_reserved3</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o4">_StpuiCurveClass::_gtk_reserved3</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -106,13 +93,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="43708b729750b48f02a0273f72cb8947"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved4" ref="43708b729750b48f02a0273f72cb8947" args=")(void)" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved4" ref="o5" 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#43708b729750b48f02a0273f72cb8947">_StpuiCurveClass::_gtk_reserved4</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o5">_StpuiCurveClass::_gtk_reserved4</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -129,13 +116,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="bd4d748a3214fe60405dd0f19071963c"></a><!-- doxytag: member="_StpuiCurveClass::curve_type_changed" ref="bd4d748a3214fe60405dd0f19071963c" args=")(StpuiCurve *curve)" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiCurveClass::curve_type_changed" ref="o1" 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#bd4d748a3214fe60405dd0f19071963c">_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#o1">_StpuiCurveClass::curve_type_changed</a>)(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)          </td>
         </tr>
       </table>
     </td>
@@ -152,13 +139,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="30b4ac9159b3909d53a2913e9d33ce37"></a><!-- doxytag: member="_StpuiCurveClass::parent_class" ref="30b4ac9159b3909d53a2913e9d33ce37" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiCurveClass::parent_class" ref="o0" 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#30b4ac9159b3909d53a2913e9d33ce37">_StpuiCurveClass::parent_class</a>          </td>
+          <td class="md" nowrap valign="top">GtkDrawingAreaClass <a class="el" href="struct__StpuiCurveClass.html#o0">_StpuiCurveClass::parent_class</a>          </td>
         </tr>
       </table>
     </td>
@@ -177,8 +164,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 Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
index a0993f3..1dfdb1d 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
@@ -2,50 +2,37 @@
 <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.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>
+<!-- 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>
 <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#fad9b4ea6fda50ab90f21ab8d4b6b70c">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#o0">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#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#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#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#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#f40e80ae3d6e7d34a12bf5c9d58c140b">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#o3">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#05b048d7242cb7b8b57cfa3b1d65ecea">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#o4">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#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#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#5b7be56d829006b2914afe741e75a31e">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#o6">gamma_text</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="f40e80ae3d6e7d34a12bf5c9d58c140b"></a><!-- doxytag: member="_StpuiGammaCurve::button" ref="f40e80ae3d6e7d34a12bf5c9d58c140b" args="[5]" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiGammaCurve::button" ref="o3" 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#f40e80ae3d6e7d34a12bf5c9d58c140b">_StpuiGammaCurve::button</a>[5]          </td>
+          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o3">_StpuiGammaCurve::button</a>[5]          </td>
         </tr>
       </table>
     </td>
@@ -62,13 +49,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="4efa264f5ef3e1a5c95736e07544ebf0"></a><!-- doxytag: member="_StpuiGammaCurve::curve" ref="4efa264f5ef3e1a5c95736e07544ebf0" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiGammaCurve::curve" ref="o2" 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#4efa264f5ef3e1a5c95736e07544ebf0">_StpuiGammaCurve::curve</a>          </td>
+          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o2">_StpuiGammaCurve::curve</a>          </td>
         </tr>
       </table>
     </td>
@@ -85,13 +72,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="05b048d7242cb7b8b57cfa3b1d65ecea"></a><!-- doxytag: member="_StpuiGammaCurve::gamma" ref="05b048d7242cb7b8b57cfa3b1d65ecea" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiGammaCurve::gamma" ref="o4" 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#05b048d7242cb7b8b57cfa3b1d65ecea">_StpuiGammaCurve::gamma</a>          </td>
+          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiGammaCurve.html#o4">_StpuiGammaCurve::gamma</a>          </td>
         </tr>
       </table>
     </td>
@@ -108,13 +95,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="8dadefcd22adf55ea28403e900b2329e"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_dialog" ref="8dadefcd22adf55ea28403e900b2329e" args="" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_dialog" ref="o5" 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#8dadefcd22adf55ea28403e900b2329e">_StpuiGammaCurve::gamma_dialog</a>          </td>
+          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o5">_StpuiGammaCurve::gamma_dialog</a>          </td>
         </tr>
       </table>
     </td>
@@ -131,13 +118,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="5b7be56d829006b2914afe741e75a31e"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_text" ref="5b7be56d829006b2914afe741e75a31e" args="" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_text" ref="o6" 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#5b7be56d829006b2914afe741e75a31e">_StpuiGammaCurve::gamma_text</a>          </td>
+          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o6">_StpuiGammaCurve::gamma_text</a>          </td>
         </tr>
       </table>
     </td>
@@ -154,13 +141,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="aab9e1de16f38176f86d7a92ba337a8d"></a><!-- doxytag: member="_StpuiGammaCurve::table" ref="aab9e1de16f38176f86d7a92ba337a8d" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiGammaCurve::table" ref="o1" 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#aab9e1de16f38176f86d7a92ba337a8d">_StpuiGammaCurve::table</a>          </td>
+          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o1">_StpuiGammaCurve::table</a>          </td>
         </tr>
       </table>
     </td>
@@ -177,13 +164,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="fad9b4ea6fda50ab90f21ab8d4b6b70c"></a><!-- doxytag: member="_StpuiGammaCurve::vbox" ref="fad9b4ea6fda50ab90f21ab8d4b6b70c" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiGammaCurve::vbox" ref="o0" 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#fad9b4ea6fda50ab90f21ab8d4b6b70c">_StpuiGammaCurve::vbox</a>          </td>
+          <td class="md" nowrap valign="top">GtkVBox <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve::vbox</a>          </td>
         </tr>
       </table>
     </td>
@@ -202,8 +189,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 Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
index a0e8165..a4ede5a 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
@@ -2,46 +2,33 @@
 <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.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>
+<!-- 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>
 <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#30b4ac9159b3909d53a2913e9d33ce37">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#o0">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#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#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#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#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#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#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#43708b729750b48f02a0273f72cb8947">_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#o4">_gtk_reserved4</a> )(void)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="858c3bfbf2316dff67461668960ea424"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved1" ref="858c3bfbf2316dff67461668960ea424" args=")(void)" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved1" ref="o1" 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#858c3bfbf2316dff67461668960ea424">_StpuiGammaCurveClass::_gtk_reserved1</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o1">_StpuiGammaCurveClass::_gtk_reserved1</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -58,13 +45,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b98e90cf60128ee094ed5cbec3f7b9bd"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved2" ref="b98e90cf60128ee094ed5cbec3f7b9bd" args=")(void)" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved2" ref="o2" 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#b98e90cf60128ee094ed5cbec3f7b9bd">_StpuiGammaCurveClass::_gtk_reserved2</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o2">_StpuiGammaCurveClass::_gtk_reserved2</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -81,13 +68,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="3a79f396911263c8c1c03ead4a6feecf"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved3" ref="3a79f396911263c8c1c03ead4a6feecf" args=")(void)" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved3" ref="o3" 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#3a79f396911263c8c1c03ead4a6feecf">_StpuiGammaCurveClass::_gtk_reserved3</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o3">_StpuiGammaCurveClass::_gtk_reserved3</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -104,13 +91,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="43708b729750b48f02a0273f72cb8947"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved4" ref="43708b729750b48f02a0273f72cb8947" args=")(void)" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved4" ref="o4" 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#43708b729750b48f02a0273f72cb8947">_StpuiGammaCurveClass::_gtk_reserved4</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o4">_StpuiGammaCurveClass::_gtk_reserved4</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -127,13 +114,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="30b4ac9159b3909d53a2913e9d33ce37"></a><!-- doxytag: member="_StpuiGammaCurveClass::parent_class" ref="30b4ac9159b3909d53a2913e9d33ce37" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiGammaCurveClass::parent_class" ref="o0" 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#30b4ac9159b3909d53a2913e9d33ce37">_StpuiGammaCurveClass::parent_class</a>          </td>
+          <td class="md" nowrap valign="top">GtkVBoxClass <a class="el" href="struct__StpuiGammaCurveClass.html#o0">_StpuiGammaCurveClass::parent_class</a>          </td>
         </tr>
       </table>
     </td>
@@ -152,8 +139,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 Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html
index 5c7378d..658bf4f 100644
--- a/doc/gutenprintui2/html/structstpui__image.html
+++ b/doc/gutenprintui2/html/structstpui__image.html
@@ -2,52 +2,39 @@
 <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.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>
+<!-- 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>
 <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#73bebce395b6f1efedcf6842fbdb4d76">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#o0">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#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#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#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#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#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#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#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#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#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#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#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#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#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>
+<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>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<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>
+<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>
 <table 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#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>
+          <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>
         </tr>
       </table>
     </td>
@@ -64,13 +51,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="59c4e5062d0201345d9a3c517faed76b"></a><!-- doxytag: member="stpui_image::hflip" ref="59c4e5062d0201345d9a3c517faed76b" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stpui_image::hflip" ref="o2" 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#59c4e5062d0201345d9a3c517faed76b">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#o2">stpui_image::hflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -87,13 +74,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="73bebce395b6f1efedcf6842fbdb4d76"></a><!-- doxytag: member="stpui_image::im" ref="73bebce395b6f1efedcf6842fbdb4d76" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stpui_image::im" ref="o0" 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#73bebce395b6f1efedcf6842fbdb4d76">stpui_image::im</a>          </td>
+          <td class="md" nowrap valign="top">stp_image_t <a class="el" href="structstpui__image.html#o0">stpui_image::im</a>          </td>
         </tr>
       </table>
     </td>
@@ -110,13 +97,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="38ffe38f14b789767f8a2f7823ad665f"></a><!-- doxytag: member="stpui_image::rotate_180" ref="38ffe38f14b789767f8a2f7823ad665f" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="stpui_image::rotate_180" ref="o6" 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#38ffe38f14b789767f8a2f7823ad665f">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#o6">stpui_image::rotate_180</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -133,13 +120,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2dd5e7759fa1a528d7d609558f9a3af9"></a><!-- doxytag: member="stpui_image::rotate_ccw" ref="2dd5e7759fa1a528d7d609558f9a3af9" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stpui_image::rotate_ccw" ref="o4" 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#2dd5e7759fa1a528d7d609558f9a3af9">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#o4">stpui_image::rotate_ccw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -156,13 +143,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2f391913505ad8be5f120fdc15083631"></a><!-- doxytag: member="stpui_image::rotate_cw" ref="2f391913505ad8be5f120fdc15083631" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="stpui_image::rotate_cw" ref="o5" 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#2f391913505ad8be5f120fdc15083631">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#o5">stpui_image::rotate_cw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -179,13 +166,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2eab557840c9b342f902b27b6f4374c5"></a><!-- doxytag: member="stpui_image::transpose" ref="2eab557840c9b342f902b27b6f4374c5" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stpui_image::transpose" ref="o1" 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#2eab557840c9b342f902b27b6f4374c5">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#o1">stpui_image::transpose</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -202,13 +189,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="5a79d8a51117f0f542de337737559e35"></a><!-- doxytag: member="stpui_image::vflip" ref="5a79d8a51117f0f542de337737559e35" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stpui_image::vflip" ref="o3" 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#5a79d8a51117f0f542de337737559e35">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#o3">stpui_image::vflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -227,8 +214,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 Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html
index 7884679..c876e4c 100644
--- a/doc/gutenprintui2/html/structstpui__plist__t.html
+++ b/doc/gutenprintui2/html/structstpui__plist__t.html
@@ -2,62 +2,49 @@
 <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.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>
+<!-- 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>
 <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#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="structstpui__plist__t.html#o0">name</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"><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">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#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#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#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#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#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#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#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#9c39e63596d53eb17161a43fce627940">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#o6">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#0ad29dfafe3dc8ad331b9397912e3d4d">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#o7">scaling</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"><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">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#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#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#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#01f4a6c8919018e9df44948ed78a5f71">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#o11">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#9e3669d19b675bd57058fd4664205d2a">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#o12">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="b679b17522d3fbb138dad90635cb91f7"></a><!-- doxytag: member="stpui_plist_t::auto_size_roll_feed_paper" ref="b679b17522d3fbb138dad90635cb91f7" args="" --><p>
+<a class="anchor" name="o10"></a><!-- doxytag: member="stpui_plist_t::auto_size_roll_feed_paper" ref="o10" 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#b679b17522d3fbb138dad90635cb91f7">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#o10">stpui_plist_t::auto_size_roll_feed_paper</a>          </td>
         </tr>
       </table>
     </td>
@@ -74,13 +61,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="193b6cc04eadeb71b71417bf19c48c4c"></a><!-- doxytag: member="stpui_plist_t::command_type" ref="193b6cc04eadeb71b71417bf19c48c4c" args="" --><p>
+<a class="anchor" name="o1"></a><!-- doxytag: member="stpui_plist_t::command_type" ref="o1" 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#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a> <a class="el" href="structstpui__plist__t.html#193b6cc04eadeb71b71417bf19c48c4c">stpui_plist_t::command_type</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -97,13 +84,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="d7d54f45247db317b37d0a4a1b4fc3d2"></a><!-- doxytag: member="stpui_plist_t::current_standard_command" ref="d7d54f45247db317b37d0a4a1b4fc3d2" args="" --><p>
+<a class="anchor" name="o5"></a><!-- doxytag: member="stpui_plist_t::current_standard_command" ref="o5" 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#d7d54f45247db317b37d0a4a1b4fc3d2">stpui_plist_t::current_standard_command</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o5">stpui_plist_t::current_standard_command</a>          </td>
         </tr>
       </table>
     </td>
@@ -120,13 +107,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="4ea7b75bdeda81e50ea3cd316b341f41"></a><!-- doxytag: member="stpui_plist_t::custom_command" ref="4ea7b75bdeda81e50ea3cd316b341f41" args="" --><p>
+<a class="anchor" name="o4"></a><!-- doxytag: member="stpui_plist_t::custom_command" ref="o4" 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#4ea7b75bdeda81e50ea3cd316b341f41">stpui_plist_t::custom_command</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o4">stpui_plist_t::custom_command</a>          </td>
         </tr>
       </table>
     </td>
@@ -143,13 +130,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="41633c85d02d5b0157efadd6414fa77e"></a><!-- doxytag: member="stpui_plist_t::extra_printer_options" ref="41633c85d02d5b0157efadd6414fa77e" args="" --><p>
+<a class="anchor" name="o3"></a><!-- doxytag: member="stpui_plist_t::extra_printer_options" ref="o3" 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#41633c85d02d5b0157efadd6414fa77e">stpui_plist_t::extra_printer_options</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o3">stpui_plist_t::extra_printer_options</a>          </td>
         </tr>
       </table>
     </td>
@@ -166,13 +153,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="01f4a6c8919018e9df44948ed78a5f71"></a><!-- doxytag: member="stpui_plist_t::invalid_mask" ref="01f4a6c8919018e9df44948ed78a5f71" args="" --><p>
+<a class="anchor" name="o11"></a><!-- doxytag: member="stpui_plist_t::invalid_mask" ref="o11" 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#01f4a6c8919018e9df44948ed78a5f71">stpui_plist_t::invalid_mask</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#o11">stpui_plist_t::invalid_mask</a>          </td>
         </tr>
       </table>
     </td>
@@ -189,13 +176,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stpui_plist_t::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
+<a class="anchor" name="o0"></a><!-- doxytag: member="stpui_plist_t::name" ref="o0" 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#b068931cc450442b63f5b3d276ea4297">stpui_plist_t::name</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o0">stpui_plist_t::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -212,13 +199,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="da1639422ad8f355d2371428471379b5"></a><!-- doxytag: member="stpui_plist_t::orientation" ref="da1639422ad8f355d2371428471379b5" args="" --><p>
+<a class="anchor" name="o8"></a><!-- doxytag: member="stpui_plist_t::orientation" ref="o8" 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#b72dd018d9f09ee35f7ac40fc7f29593">orient_t</a> <a class="el" href="structstpui__plist__t.html#da1639422ad8f355d2371428471379b5">stpui_plist_t::orientation</a>          </td>
+          <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>
         </tr>
       </table>
     </td>
@@ -235,13 +222,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9c39e63596d53eb17161a43fce627940"></a><!-- doxytag: member="stpui_plist_t::output_filename" ref="9c39e63596d53eb17161a43fce627940" args="" --><p>
+<a class="anchor" name="o6"></a><!-- doxytag: member="stpui_plist_t::output_filename" ref="o6" 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#9c39e63596d53eb17161a43fce627940">stpui_plist_t::output_filename</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o6">stpui_plist_t::output_filename</a>          </td>
         </tr>
       </table>
     </td>
@@ -258,13 +245,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="692e12dd54ad3badf18627bdb1784843"></a><!-- doxytag: member="stpui_plist_t::queue_name" ref="692e12dd54ad3badf18627bdb1784843" args="" --><p>
+<a class="anchor" name="o2"></a><!-- doxytag: member="stpui_plist_t::queue_name" ref="o2" 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#692e12dd54ad3badf18627bdb1784843">stpui_plist_t::queue_name</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o2">stpui_plist_t::queue_name</a>          </td>
         </tr>
       </table>
     </td>
@@ -281,13 +268,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="0ad29dfafe3dc8ad331b9397912e3d4d"></a><!-- doxytag: member="stpui_plist_t::scaling" ref="0ad29dfafe3dc8ad331b9397912e3d4d" args="" --><p>
+<a class="anchor" name="o7"></a><!-- doxytag: member="stpui_plist_t::scaling" ref="o7" 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#0ad29dfafe3dc8ad331b9397912e3d4d">stpui_plist_t::scaling</a>          </td>
+          <td class="md" nowrap valign="top">float <a class="el" href="structstpui__plist__t.html#o7">stpui_plist_t::scaling</a>          </td>
         </tr>
       </table>
     </td>
@@ -304,13 +291,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="3e34bdebd9bd5edda27e8728904a2552"></a><!-- doxytag: member="stpui_plist_t::unit" ref="3e34bdebd9bd5edda27e8728904a2552" args="" --><p>
+<a class="anchor" name="o9"></a><!-- doxytag: member="stpui_plist_t::unit" ref="o9" 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#3e34bdebd9bd5edda27e8728904a2552">stpui_plist_t::unit</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#o9">stpui_plist_t::unit</a>          </td>
         </tr>
       </table>
     </td>
@@ -327,13 +314,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="9e3669d19b675bd57058fd4664205d2a"></a><!-- doxytag: member="stpui_plist_t::v" ref="9e3669d19b675bd57058fd4664205d2a" args="" --><p>
+<a class="anchor" name="o12"></a><!-- doxytag: member="stpui_plist_t::v" ref="o12" 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#9e3669d19b675bd57058fd4664205d2a">stpui_plist_t::v</a>          </td>
+          <td class="md" nowrap valign="top">stp_vars_t* <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t::v</a>          </td>
         </tr>
       </table>
     </td>
@@ -352,8 +339,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 Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/tab_b.gif b/doc/gutenprintui2/html/tab_b.gif
deleted file mode 100644
index 0d62348..0000000
--- a/doc/gutenprintui2/html/tab_b.gif
+++ /dev/null
diff --git a/doc/gutenprintui2/html/tab_l.gif b/doc/gutenprintui2/html/tab_l.gif
deleted file mode 100644
index 9b1e633..0000000
--- a/doc/gutenprintui2/html/tab_l.gif
+++ /dev/null
diff --git a/doc/gutenprintui2/html/tab_r.gif b/doc/gutenprintui2/html/tab_r.gif
deleted file mode 100644
index ce9dd9f..0000000
--- a/doc/gutenprintui2/html/tab_r.gif
+++ /dev/null
diff --git a/doc/gutenprintui2/html/tabs.css b/doc/gutenprintui2/html/tabs.css
deleted file mode 100644
index a61552a..0000000
--- a/doc/gutenprintui2/html/tabs.css
+++ /dev/null
@@ -1,102 +0,0 @@
-/* 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 f4d4a43..8e8f648 100644
--- a/doc/gutenprintui2/html/typebuiltins_8h.html
+++ b/doc/gutenprintui2/html/typebuiltins_8h.html
@@ -2,43 +2,31 @@
 <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.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>
+<!-- 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>
 <div class="nav">
-<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>
+<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.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#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#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#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#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#fd1aa89f9f88935e1482fa6675a28ee1">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#a2">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#2c321ec10322da403b1709b4a8956ee3">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#a3">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#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#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#5e570d0225cd4f8ef426d648293dced9">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#a5">stpui_curve_type_get_type</a> (void)</td></tr>
 
 </table>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="c556621db9092f28e345b98cb6db57e3"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_COMMAND_T" ref="c556621db9092f28e345b98cb6db57e3" args="" --><p>
+<a class="anchor" name="a1"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_COMMAND_T" ref="a1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -61,7 +49,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="fd1aa89f9f88935e1482fa6675a28ee1"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_CURVE_TYPE" ref="fd1aa89f9f88935e1482fa6675a28ee1" args="" --><p>
+<a class="anchor" name="a2"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_CURVE_TYPE" ref="a2" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -84,7 +72,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="b188f6f607a7c274ff9b93a7b9183c92"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_ORIENT_T" ref="b188f6f607a7c274ff9b93a7b9183c92" args="" --><p>
+<a class="anchor" name="a0"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_ORIENT_T" ref="a0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -108,7 +96,7 @@
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="43d1612dab4df6c31f9b5362f88eaadf"></a><!-- doxytag: member="typebuiltins.h::command_t_command_t_get_type" ref="43d1612dab4df6c31f9b5362f88eaadf" args="(void)" --><p>
+<a class="anchor" name="a4"></a><!-- doxytag: member="typebuiltins.h::command_t_command_t_get_type" ref="a4" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -136,7 +124,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="2c321ec10322da403b1709b4a8956ee3"></a><!-- doxytag: member="typebuiltins.h::orient_t_orient_t_get_type" ref="2c321ec10322da403b1709b4a8956ee3" args="(void)" --><p>
+<a class="anchor" name="a3"></a><!-- doxytag: member="typebuiltins.h::orient_t_orient_t_get_type" ref="a3" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -164,7 +152,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="5e570d0225cd4f8ef426d648293dced9"></a><!-- doxytag: member="typebuiltins.h::stpui_curve_type_get_type" ref="5e570d0225cd4f8ef426d648293dced9" args="(void)" --><p>
+<a class="anchor" name="a5"></a><!-- doxytag: member="typebuiltins.h::stpui_curve_type_get_type" ref="a5" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -192,8 +180,8 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Mon Jan 16 10:06:53 2006 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.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
 </body>
 </html>
diff --git a/include/Makefile.in b/include/Makefile.in
index 3c2b9a8..d502a69 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -280,10 +280,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index aa50960..339a3e6 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -288,10 +288,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/include/gutenprintui/Makefile.in b/include/gutenprintui/Makefile.in
index 3f5eb4c..c8d50be 100644
--- a/include/gutenprintui/Makefile.in
+++ b/include/gutenprintui/Makefile.in
@@ -284,10 +284,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index d44c577..2598115 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -285,10 +285,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/m4/stp_release.m4 b/m4/stp_release.m4
index a47f9e1..dfb40c0 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="22 Nov 2005"
+RELEASE_DATE="22 Jan 2006"
 AC_DEFINE_UNQUOTED(RELEASE_DATE, "${RELEASE_DATE}", [Package release date.])
 AC_SUBST(RELEASE_DATE)])
diff --git a/m4extra/gettext.m4 b/m4extra/gettext.m4
index 06d58f9..624a807 100644
--- a/m4extra/gettext.m4
+++ b/m4extra/gettext.m4
@@ -1,27 +1,113 @@
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 5
-
-AC_DEFUN(AM_WITH_NLS,
-  [AC_MSG_CHECKING([whether NLS is requested])
-    dnl Default is enabled NLS
-    AC_ARG_ENABLE(nls,
-      [  --disable-nls           do not use Native Language Support],
-      USE_NLS=$enableval, USE_NLS=yes)
-    AC_MSG_RESULT($USE_NLS)
-    AC_SUBST(USE_NLS)
+# gettext.m4 serial 37 (gettext-0.14.4)
+dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
 
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl    default (if it is not specified or empty) is 'no-libtool'.
+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  ifelse(gt_included_intl, yes, [
+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
+  ])
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AM_NLS
+
+  ifelse(gt_included_intl, yes, [
+    BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
 
-    dnl If we use NLS figure out what method
-    if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    ifelse(gt_included_intl, yes, [
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -31,285 +117,433 @@ AC_DEFUN(AM_WITH_NLS,
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
         dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If gettext or catgets are available (in this order) we
-        dnl use this.  Else we have to fall back to GNU NLS library.
-	dnl catgets is only used if permitted by option --with-catgets.
-	nls_cv_header_intl=
-	nls_cv_header_libgt=
-	CATOBJEXT=NONE
-
-	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
-	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [AC_CACHE_CHECK([for gettext in libintl],
-		 gt_cv_func_gettext_libintl,
-		 [AC_CHECK_LIB(intl, gettext,
-		  gt_cv_func_gettext_libintl=yes,
-		  gt_cv_func_gettext_libintl=no)],
-		 gt_cv_func_gettext_libintl=no)])
-	   fi
-
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
-	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	      if test "$MSGFMT" != "no"; then
-		AC_CHECK_FUNCS(dcgettext)
-		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr],
-		  [CATOBJEXT=.gmo
-		   DATADIRNAME=share],
-		  [CATOBJEXT=.mo
-		   DATADIRNAME=lib])
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-	])
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  AC_MSG_CHECKING([whether catgets can be used])
-	  AC_ARG_WITH(catgets,
-	    [  --with-catgets          use catgets functions if available],
-	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-	  AC_MSG_RESULT($nls_cv_use_catgets)
-
-	  if test "$nls_cv_use_catgets" = "yes"; then
-	    dnl No gettext in C library.  Try catgets next.
-	    AC_CHECK_LIB(i, main)
-	    AC_CHECK_FUNC(catgets,
-	      [AC_DEFINE(HAVE_CATGETS)
-	       INTLOBJS="\$(CATOBJS)"
-	       AC_PATH_PROG(GENCAT, gencat, no)dnl
-	       if test "$GENCAT" != "no"; then
-		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-		 if test "$GMSGFMT" = "no"; then
-		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-		 fi
-		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		 USE_INCLUDED_LIBINTL=yes
-		 CATOBJEXT=.cat
-		 INSTOBJEXT=.cat
-		 DATADIRNAME=lib
-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
-		 INTLLIBS=$INTLDEPS
-		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-		 nls_cv_header_intl=intl/libintl.h
-		 nls_cv_header_libgt=intl/libgettext.h
-	       fi])
-	  fi
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        dnl Add a version number to the cache macros.
+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
+        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
+        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
+
+        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+         [AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+            [bindtextdomain ("", "");
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            gt_cv_func_gnugettext_libc=yes,
+            gt_cv_func_gnugettext_libc=no)])
+
+        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          ifelse(gt_included_intl, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            gt_cv_func_gnugettext_libintl,
+           [gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+              [bindtextdomain ("", "");
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+              gt_cv_func_gnugettext_libintl=yes,
+              gt_cv_func_gnugettext_libintl=no)
+            dnl Now see whether libintl exists and depends on libiconv.
+            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+                [bindtextdomain ("", "");
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+               [LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                gt_cv_func_gnugettext_libintl=yes
+               ])
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"])
         fi
 
-        if test "$CATOBJEXT" = "NONE"; then
-	  dnl Neither gettext nor catgets in included in the C library.
-	  dnl Fall back on GNU gettext library.
-	  nls_cv_use_gnu_gettext=yes
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if test "$gt_cv_func_gnugettext_libc" = "yes" \
+           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    ifelse(gt_included_intl, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
         fi
       fi
 
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
         dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
-        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-        AC_SUBST(MSGFMT)
-	USE_INCLUDED_LIBINTL=yes
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      CATOBJEXT=
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
         CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
       fi
+    ])
 
-      dnl Test whether we really found GNU xgettext.
-      if test "$XGETTEXT" != ":"; then
-	dnl If it is no GNU xgettext we define it as : so that the
-	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  AC_MSG_RESULT(
-	    [found xgettext program is not GNU xgettext; ignore it])
-	  XGETTEXT=":"
-	fi
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
       fi
+    fi
 
-      # We need to process the po/ directory.
-      POSUB=po
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
     else
-      DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
+      USE_NLS=no
     fi
-    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
-    AC_OUTPUT_COMMANDS(
-     [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
-
-
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
-    if test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE(HAVE_GETTEXT, 1,
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE(HAVE_DCGETTEXT, 1,
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
     fi
 
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  ifelse(gt_included_intl, yes, [
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
 
     dnl Make all variables we use known to autoconf.
+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
     AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATALOGS)
     AC_SUBST(CATOBJEXT)
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
     AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
     AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLDEPS)
-    AC_SUBST(INTLLIBS)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
     AC_SUBST(INTLOBJS)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
 
-AC_DEFUN(AM_GNU_GETTEXT,
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_ISC_POSIX])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_CONST])dnl
-   AC_REQUIRE([AC_C_INLINE])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h sys/param.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-strdup __argz_count __argz_stringify __argz_next])
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     AC_CHECK_FUNCS(stpcpy)
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     AC_DEFINE(HAVE_STPCPY)
-   fi
-
-   AM_LC_MESSAGES
-   AM_WITH_NLS
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl The reference to <locale.h> in the installed <libintl.h> file
-   dnl must be resolved because we cannot expect the users of this
-   dnl to define HAVE_LOCALE_H.
-   if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-   fi
-   AC_SUBST(INCLUDE_LOCALE_H)
-
-   dnl Determine which catalog format we have (if any is needed)
-   dnl For now we know about two different formats:
-   dnl   Linux libc-5 and the normal X/Open format
-   test -d intl || mkdir intl
-   if test "$CATOBJEXT" = ".cat"; then
-     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
-     dnl Transform the SED scripts while copying because some dumb SEDs
-     dnl cannot handle comments.
-     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
-   fi
-   dnl po2tbl.sed is always needed.
-   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-
-   dnl In the intl/Makefile.in we have a special dependency which makes
-   dnl only sense for gettext.  We comment this out for non-gettext
-   dnl packages.
-   if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   AC_SUBST(GT_NO)
-   AC_SUBST(GT_YES)
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl *** For now the libtool support in intl/Makefile is not for real.
-   l=
-   AC_SUBST(l)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
+    dnl Enable libtool support if the surrounding package wishes it.
+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
   ])
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INTLLIBS="$LIBINTL"
+  AC_SUBST(INTLLIBS)
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST(LIBINTL)
+  AC_SUBST(LTLIBINTL)
+  AC_SUBST(POSUB)
+])
+
+
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([gt_GLIBC2])dnl
+  AC_REQUIRE([AC_PROG_RANLIB])dnl
+  AC_REQUIRE([AC_ISC_POSIX])dnl
+  AC_REQUIRE([AC_HEADER_STDC])dnl
+  AC_REQUIRE([AC_C_CONST])dnl
+  AC_REQUIRE([bh_C_SIGNED])dnl
+  AC_REQUIRE([AC_C_INLINE])dnl
+  AC_REQUIRE([AC_TYPE_OFF_T])dnl
+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
+  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+  AC_REQUIRE([gt_TYPE_WINT_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gt_TYPE_INTMAX_T])
+  AC_REQUIRE([gt_PRINTF_POSIX])
+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+  AC_REQUIRE([AC_FUNC_MMAP])dnl
+  AC_REQUIRE([gl_GLIBC21])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
+  AC_REQUIRE([gl_XSIZE])dnl
+  AC_REQUIRE([gt_INTL_MACOSX])dnl
+
+  AC_CHECK_TYPE([ptrdiff_t], ,
+    [AC_DEFINE([ptrdiff_t], [long],
+       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+    ])
+  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+  AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
+mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
+strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
+__fsetlocking])
+
+  dnl Use the _snprintf function only if it is declared (because on NetBSD it
+  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+  AC_SUBST([HAVE_POSIX_PRINTF])
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
+  fi
+  AC_SUBST([HAVE_ASPRINTF])
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
+  fi
+  AC_SUBST([HAVE_SNPRINTF])
+  if test "$ac_cv_func_wprintf" = yes; then
+    HAVE_WPRINTF=1
+  else
+    HAVE_WPRINTF=0
+  fi
+  AC_SUBST([HAVE_WPRINTF])
+
+  AM_ICONV
+  AM_LANGINFO_CODESET
+  if test $ac_cv_header_locale_h = yes; then
+    gt_LC_MESSAGES
+  fi
+
+  if test -n "$INTL_MACOSX_LIBS"; then
+    CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+  fi
+
+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+  dnl because plural.y uses bison specific features. It requires at least
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
+  dnl bison is only needed for the maintainer (who touches plural.y). But in
+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+  dnl the rule in general Makefile. Now, some people carelessly touch the
+  dnl files or have a broken "make" program, hence the plural.c rule will
+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+  dnl present or too old.
+  AC_CHECK_PROGS([INTLBISON], [bison])
+  if test -z "$INTLBISON"; then
+    ac_verc_fail=yes
+  else
+    dnl Found it, now check the version.
+    AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+    case $ac_prog_version in
+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+    esac
+    AC_MSG_RESULT([$ac_prog_version])
+  fi
+  if test $ac_verc_fail = yes; then
+    INTLBISON=:
+  fi
+])
+
+
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    gt_cv_func_CFPreferencesCopyAppValue,
+    [gt_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+     gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -framework CoreFoundation"
+     AC_TRY_LINK([#include <CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     CPPFLAGS="$gt_save_CPPFLAGS"
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+    [gt_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+     gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -framework CoreFoundation"
+     AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     CPPFLAGS="$gt_save_CPPFLAGS"
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
+
+
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
+[
+  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+    [AC_TRY_COMPILE([$2], [
+#ifndef $1
+  char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+  if test $ac_cv_have_decl_$1 = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/m4extra/gtk.m4 b/m4extra/gtk.m4
new file mode 100644
index 0000000..f2dd472
--- /dev/null
+++ b/m4extra/gtk.m4
@@ -0,0 +1,194 @@
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
+
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+dnl
+AC_DEFUN([AM_PATH_GTK],
+[dnl 
+dnl Get the cflags and libraries from the gtk-config script
+dnl
+AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
+            gtk_config_prefix="$withval", gtk_config_prefix="")
+AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
+            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
+		    , enable_gtktest=yes)
+
+  for module in . $4
+  do
+      case "$module" in
+         gthread) 
+             gtk_config_args="$gtk_config_args gthread"
+         ;;
+      esac
+  done
+
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  fi
+
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+  min_gtk_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+  no_gtk=""
+  if test "$GTK_CONFIG" = "no" ; then
+    no_gtk=yes
+  else
+    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config to some extent
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtktest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If gtk-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$GTK_CONFIG" = "no" ; then
+       echo "*** The gtk-config script installed by GTK could not be found"
+       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GTK_CONFIG environment variable to the"
+       echo "*** full path to gtk-config."
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK test program, checking why..."
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK or finding the wrong"
+          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])
diff --git a/m4extra/lcmessage.m4 b/m4extra/lcmessage.m4
index e31bb53..19aa77e 100644
--- a/m4extra/lcmessage.m4
+++ b/m4extra/lcmessage.m4
@@ -1,19 +1,30 @@
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# lcmessage.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
 
-# serial 1
+# Check whether LC_MESSAGES is available in <locale.h>.
 
-AC_DEFUN(AM_LC_MESSAGES,
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
-    fi
-  fi])
+AC_DEFUN([gt_LC_MESSAGES],
+[
+  AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
+  if test $gt_cv_val_LC_MESSAGES = yes; then
+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
+      [Define if your <locale.h> file defines LC_MESSAGES.])
+  fi
+])
diff --git a/m4extra/libtool.m4 b/m4extra/libtool.m4
index 8b71d7c..068d85c 100644
--- a/m4extra/libtool.m4
+++ b/m4extra/libtool.m4
@@ -1,95 +1,513 @@
-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
-## Copyright (C) 1996-1999 Free Software Foundation, Inc.
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+## Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
-## 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.
+## 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 40 AC_PROG_LIBTOOL
-AC_DEFUN(AC_PROG_LIBTOOL,
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+# serial 48 Debian 1.5.22-1 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
 
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
 
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
 
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 AC_SUBST(LIBTOOL)dnl
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
 
-AC_DEFUN(AC_LIBTOOL_SETUP,
-[AC_PREREQ(2.13)dnl
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
+
 AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  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*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    AC_PATH_MAGIC
+  fi
+  ;;
+esac
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+AC_ARG_WITH([pic],
+    [AC_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
+
+
+# _LT_AC_SYS_COMPILER
+# -------------------
+AC_DEFUN([_LT_AC_SYS_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+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; /^ *+/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; /^ *+/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
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`; fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_AC_SYS_LIBPATH_AIX
+
+
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_AC_SHELL_INIT
+
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+[$]*
+EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(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` &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    IFS="$lt_save_ifs"
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "[$]0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
+
+
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+    [AC_HELP_STRING([--disable-libtool-lock],
+	[avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case $host in
+ia64-*-hpux*)
+  # 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.$ac_objext` in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
+    case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -100,6 +518,49 @@ case "$host" in
       LD="${LD-ld} -64"
       ;;
     esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+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
+    *32-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
   fi
   rm -rf conftest*
   ;;
@@ -109,155 +570,1602 @@ case "$host" in
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
+    [AC_LANG_PUSH(C)
      AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+     AC_LANG_POP])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # 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
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
 
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw*)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
   ;;
-])
+  ])
 esac
+
+need_locks="$enable_libtool_lock"
+
+])# _LT_AC_LOCK
+
+
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # 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}\{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)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   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 other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $rm conftest*
 ])
 
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AC_ENABLE_SHARED, [dnl
-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
+if test x"[$]$2" = xyes; then
+    ifelse([$5], , :, [$5])
+else
+    ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
+
+
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   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 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 -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $rm conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    ifelse([$4], , :, [$4])
+else
+    ifelse([$5], , :, [$5])
+fi
+])# AC_LIBTOOL_LINKER_OPTION
+
+
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    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
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+    # 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`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  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
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    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.
+    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`
+      teststring=$teststring$teststring
+    done
+    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.
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    ;;
+  esac
 ])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
+
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+    exit (status);
+}]
+EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+
+# AC_LIBTOOL_DLOPEN_SELF
+# ----------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+   ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+   ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+    	  lt_cv_dlopen_self_static, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $rm -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # 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}\{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)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   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
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || 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 . 2>&AS_MESSAGE_LOG_FD
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
+   cd ..
+   rmdir conftest
+   $rm conftest*
+])
+])# AC_LIBTOOL_PROG_CC_C_O
+
+
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
+
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
+
+
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+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
+
+  # We can hardcode non-existant directories.
+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         AC_MSG_RESULT([yes])
+       else
+  AC_MSG_RESULT([no])
+fi
+       ;;
+   *)
+  AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+])# AC_LIBTOOL_SYS_LIB_STRIP
+
+
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+[AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+if test "$GCC" = yes; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  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'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      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~
+      chmod a+x \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    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}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  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"`
+  else
+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+  fi
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  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
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+kfreebsd*-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='GNU ld.so'
+  ;;
+
+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*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  freebsd*) # from 4.6 on
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+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
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+   hppa*64*)
+     shrext_cmds='.sl'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+   *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix3*)
+  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'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  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'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    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
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  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
+  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='GNU ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+nto-qnx*)
+  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=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # 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
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+solaris*)
+  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=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  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
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      export_dynamic_flag_spec='${wl}-Blargedynsym'
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+    shlibpath_overrides_runpath=no
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    shlibpath_overrides_runpath=yes
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+uts4*)
+  version_type=linux
+  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
+  ;;
 
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AC_ENABLE_STATIC, [dnl
-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
 *)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+# _LT_AC_TAGCONFIG
+# ----------------
+AC_DEFUN([_LT_AC_TAGCONFIG],
+[AC_ARG_WITH([tags],
+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+        [include additional configurations @<:@automatic@:>@])],
+    [tagnames="$withval"])
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+  if test ! -f "${ofile}"; then
+    AC_MSG_WARN([output file `$ofile' does not exist])
+  fi
+
+  if test -z "$LTCC"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+    if test -z "$LTCC"; then
+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+    else
+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+    fi
+  fi
+  if test -z "$LTCFLAGS"; then
+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+  fi
+
+  # Extract list of available tagged configurations in $ofile.
+  # Note that this assumes the entire list is on one line.
+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+  for tagname in $tagnames; do
+    IFS="$lt_save_ifs"
+    # Check whether tagname contains only valid characters
+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+    "") ;;
+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+	;;
+    esac
+
+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+    then
+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+    fi
+
+    # Update the list of available tags.
+    if test -n "$tagname"; then
+      echo appending configuration tag \"$tagname\" to $ofile
+
+      case $tagname in
+      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_LIBTOOL_LANG_CXX_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      F77)
+	if test -n "$F77" && test "X$F77" != "Xno"; then
+	  AC_LIBTOOL_LANG_F77_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      GCJ)
+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+	  AC_LIBTOOL_LANG_GCJ_CONFIG
+	else
+	  tagname=""
+	fi
+	;;
+
+      RC)
+	AC_LIBTOOL_LANG_RC_CONFIG
+	;;
+
+      *)
+	AC_MSG_ERROR([Unsupported tag name: $tagname])
+	;;
+      esac
+
+      # Append the new tag name to the list of available tags.
+      if test -n "$tagname" ; then
+      available_tags="$available_tags $tagname"
+    fi
     fi
   done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
+  IFS="$lt_save_ifs"
+
+  # Now substitute the updated list of available tags.
+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+    mv "${ofile}T" "$ofile"
+    chmod +x "$ofile"
+  else
+    rm -f "${ofile}T"
+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+  fi
+fi
+])# _LT_AC_TAGCONFIG
+
+
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+AC_DEFUN([AC_LIBTOOL_DLOPEN],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_DLOPEN
 
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
+
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 DLLs
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_WIN32_DLL
+
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([shared],
+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+])# AC_ENABLE_SHARED
+
+
+# AC_DISABLE_SHARED
+# -----------------
+# set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
+
+
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([static],
+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
+
+
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
+
+
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([fast-install],
+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
+
+
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
+
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
+
+
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
+
+
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognise shared library
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
 *)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="ifelse([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"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
+	    :
+	  else
+	    cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+	  fi ;;
+	esac
+      fi
+      break
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+])# AC_PATH_TOOL_PREFIX
+
+
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognise a shared library
+AC_DEFUN([AC_PATH_MAGIC],
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# AC_PATH_MAGIC
 
-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
 
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AC_PROG_LD,
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([AC_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+    [AC_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])
+AC_REQUIRE([LT_AC_PROG_SED])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
+if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
     # Accept absolute paths.
-changequote(,)dnl
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-changequote([,])dnl
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -275,130 +2183,382 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(ac_cv_path_LD,
+AC_CACHE_VAL(lt_cv_path_LD,
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
+      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.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
 	test "$with_gnu_ld" != no && break
-      else
+	;;
+      *)
 	test "$with_gnu_ld" != yes && break
-      fi
+	;;
+      esac
     fi
   done
-  IFS="$ac_save_ifs"
+  IFS="$lt_save_ifs"
 else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$ac_cv_path_LD"
+LD="$lt_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
   AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
 AC_PROG_LD_GNU
-])
+])# AC_PROG_LD
 
-AC_DEFUN(AC_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi])
+
+# 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 lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# AC_PROG_LD_GNU
+
+
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+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='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+])# AC_PROG_LD_RELOAD_FLAG
+
+
+# AC_DEPLIBS_CHECK_METHOD
+# -----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+[AC_CACHE_CHECK([how to recognise dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix4* | aix5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+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*)
+  # 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='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # 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'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+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|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.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  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
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix3*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+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
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+nto-qnx*)
+  lt_cv_deplibs_check_method=unknown
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
 ])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+])# AC_DEPLIBS_CHECK_METHOD
 
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AC_PROG_NM,
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(ac_cv_path_NM,
+
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
+AC_DEFUN([AC_PROG_NM],
+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  ac_cv_path_NM="$NM"
+  lt_cv_path_NM="$NM"
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$ac_dir/nm -B"
-	break
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$ac_dir/nm -p"
-	break
-      else
-	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
       fi
-    fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
-NM="$ac_cv_path_NM"
-AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
-])
+NM="$lt_cv_path_NM"
+])# AC_PROG_NM
+
 
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN(AC_CHECK_LIBM,
+# AC_CHECK_LIBM
+# -------------
+# check for math library
+AC_DEFUN([AC_CHECK_LIBM],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case "$host" in
-*-*-beos* | *-*-cygwin*)
-  # These system don't have libm
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
   AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
   ;;
 *)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
   ;;
 esac
-])
+])# AC_CHECK_LIBM
 
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library, adds --enable-ltdl-convenience to
-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-# '${top_builddir}/' (note the single quotes!) if your package is not
-# flat, and, if you're not using automake, define top_builddir as
-# appropriate in the Makefiles.
-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case "$enable_ltdl_convenience" in
+
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# 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
+# 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
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
-  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
-])
+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
 
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library, and adds --enable-ltdl-install to
-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-# '${top_builddir}/' (note the single quotes!) if your package is not
-# flat, and, if you're not using automake, define top_builddir as
-# appropriate in the Makefiles.
+
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# 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
+# 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
-  AC_CHECK_LIB(ltdl, main,
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  AC_CHECK_LIB(ltdl, lt_dlinit,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
      AC_MSG_WARN([libltdl not installed, but installation disabled])
@@ -408,23 +2568,3858 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
-    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
-    INCLTDL=
+    LTDLINCL=
+  fi
+  # For backwards non-gettext consistent compatibility...
+  INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
+
+
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
+
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+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
+# --------------
+# enable support for Fortran 77 libraries
+AC_DEFUN([AC_LIBTOOL_F77],
+[AC_REQUIRE([_LT_AC_LANG_F77])
+])# AC_LIBTOOL_F77
+
+
+# _LT_AC_LANG_F77
+# ---------------
+AC_DEFUN([_LT_AC_LANG_F77],
+[AC_REQUIRE([AC_PROG_F77])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+])# _LT_AC_LANG_F77
+
+
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
+
+
+# _LT_AC_LANG_GCJ
+# ---------------
+AC_DEFUN([_LT_AC_LANG_GCJ],
+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+])# _LT_AC_LANG_GCJ
+
+
+# AC_LIBTOOL_RC
+# -------------
+# enable support for Windows resource files
+AC_DEFUN([AC_LIBTOOL_RC],
+[AC_REQUIRE([LT_AC_PROG_RC])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+])# AC_LIBTOOL_RC
+
+
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+[lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;\n"
+
+# Code to be used in simple link tests
+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
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF
+
+# Report which library types will actually be built
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+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
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+
+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])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_C_CONFIG
+
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+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([_LT_AC_PROG_CXXCPP])
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
+_LT_AC_TAGVAR(predeps, $1)=
+_LT_AC_TAGVAR(postdeps, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;\n"
+
+# Code to be used in simple link tests
+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
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+  $as_unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+  lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+  $as_unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+else
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
+
+if test "$GXX" = yes; then
+  # Set up default GNU C++ configuration
+
+  AC_PROG_LD
+
+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+  # archiving commands below assume that GNU ld is being used.
+  if test "$with_gnu_ld" = yes; then
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $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'
+
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+    #     investigate it a little bit more. (MM)
+    wlarc='${wl}'
+
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if eval "`$CC -print-prog-name=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
+  else
+    with_gnu_ld=no
+    wlarc=
+
+    # A generic and very simple default shared library creation
+    # command for GNU C++ for the case where it uses the native
+    # linker, instead of GNU ld.  If possible, this setting should
+    # overridden to take advantage of the native linker features on
+    # the platform it is being used on.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+  fi
+
+  # Commands to make compiler produce verbose output that lists
+  # what "hidden" libraries, object files and flags are used when
+  # linking a shared library.
+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+else
+  GXX=no
+  with_gnu_ld=no
+  wlarc=
+fi
+
+# PORTME: fill in a description of your system's C++ link characteristics
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+case $host_os in
+  aix3*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  aix4* | aix5*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  case $ld_flag in
+	  *-brtl*)
+	    aix_use_runtimelinking=yes
+	    break
+	    ;;
+	  esac
+	done
+	;;
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    _LT_AC_TAGVAR(archive_cmds, $1)=''
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+    if test "$GXX" = yes; then
+      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`
+	if test -f "$collect2name" && \
+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	else
+	  # We have old collect2
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	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
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	shared_flag='-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
+      fi
+    fi
+
+    # It seems that -bexpall does not export symbols beginning with
+    # underscore (_), so it is better to generate a list of symbols to export.
+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+      # Determine the default libpath from the value encoded in an empty executable.
+      _LT_AC_SYS_LIBPATH_AIX
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+     else
+      if test "$host_cpu" = ia64; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+      else
+	# Determine the default libpath from the value encoded in an empty executable.
+	_LT_AC_SYS_LIBPATH_AIX
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	# Exported symbols can be pulled into shared objects from archives
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	# 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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+      fi
+    fi
+    ;;
+
+  beos*)
+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
+  chorus*)
+    case $cc_basename in
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    # as there is no search path for DLLs.
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+    _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
+
+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      # If the export-symbols file already is a .def file (1st line
+      # is EXPORTS), use it as is; otherwise, prepend...
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname.def;
+      else
+	echo EXPORTS > $output_objdir/$soname.def;
+	cat $export_symbols >> $output_objdir/$soname.def;
+      fi~
+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+    else
+      _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
+
+    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
+          _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
+        ;;
+
+  dgux*)
+    case $cc_basename in
+      ec++*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      ghcx*)
+	# Green Hills C++ Compiler
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  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 | dragonfly*)
+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+    # conventions
+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+    ;;
+  gnu*)
+    ;;
+  hpux9*)
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				# but as the default
+				# location of the library.
+
+    case $cc_basename in
+    CC*)
+      # FIXME: insert proper C++ library support
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    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
+      # 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 -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
+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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'
+      else
+        # FIXME: insert proper C++ library support
+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+    ;;
+  hpux10*|hpux11*)
+    if test $with_gnu_ld = no; then
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+      case $host_cpu in
+      hppa*64*|ia64*)
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+        ;;
+      *)
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        ;;
+      esac
+    fi
+    case $host_cpu in
+    hppa*64*|ia64*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+    *)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					      # but as the default
+					      # location of the library.
+      ;;
+    esac
+
+    case $cc_basename in
+      CC*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      aCC*)
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  ;;
+	esac
+	# 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 -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
+	  if test $with_gnu_ld = no; then
+	    case $host_cpu in
+	    hppa*64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    ia64*)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      ;;
+	    esac
+	  fi
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  interix3*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+    # Instead, shared libraries are loaded at an image base (0x10000000 by
+    # default) and relocated if they conflict, which is a slow very memory
+    # consuming and fragmenting process.  To avoid this, we pick a random,
+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+    ;;
+  irix5* | irix6*)
+    case $cc_basename in
+      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 ${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
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	;;
+      *)
+	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}${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
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+	;;
+    esac
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    ;;
+  linux*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	# 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 $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	;;
+      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(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'
+	;;
+      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'
+
+	runpath_var=LD_RUN_PATH
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	;;
+    esac
+    ;;
+  lynxos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  m88k*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  mvs*)
+    case $cc_basename in
+      cxx*)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  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=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    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
+    _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*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      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 ${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)=:
+
+	# 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; 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 && 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}${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)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  osf4* | osf5*)
+    case $cc_basename in
+      KCC*)
+	# Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	# KCC will only create a shared library if the output file
+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+	# to its proper name (with version) after linking.
+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# Archives containing C++ object files must be created using
+	# the KAI C++ compiler.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+	;;
+      RCC*)
+	# Rational C++ 2.4.1
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      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 ${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 ${output_objdir}/so_locations -o $lib~
+	  $rm $lib.exp'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	# 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 -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; 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 && 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}${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)=:
+
+	  # Commands to make compiler produce verbose output that lists
+	  # what "hidden" libraries, object files and flags are used when
+	  # linking a shared library.
+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+	else
+	  # FIXME: insert proper C++ library support
+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+    esac
+    ;;
+  psos*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  sunos4*)
+    case $cc_basename in
+      CC*)
+	# Sun C++ 4.x
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      lcc*)
+	# Lucid
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  solaris*)
+    case $cc_basename in
+      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}  -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}  ${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]].*) ;;
+	  *)
+	    # The C++ compiler is used as linker so we must use $wl
+	    # flag to pass the commands to the underlying system
+	    # 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`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
+
+	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
+	# necessary to make sure instantiated templates are included
+	# in the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	;;
+      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'
+
+	# The C++ compiler must be used to create the archive.
+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	;;
+      *)
+	# GNU C++ compiler with Solaris linker
+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _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 -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  else
+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	    # platform.
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	    _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 -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+	  fi
+
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	fi
+	;;
+    esac
+    ;;
+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  sysv5* | sco3.2v5* | sco5v6*)
+    # Note: We can NOT use -z defs as we might desire, because we do not
+    # link with -lc, and that would cause any symbols used from libc to
+    # always be unresolved, which means just about no library would
+    # ever link correctly.  If we're not using GNU ld we use -z text
+    # though, which does catch some bad symbols but isn't as heavy-handed
+    # as -z defs.
+    # For security reasons, it is highly recommended that you always
+    # use absolute paths for naming shared libraries, and exclude the
+    # DT_RUNPATH tag from executables and libraries.  But doing so
+    # requires that you compile everything twice, which is a pain.
+    # So that behaviour is only enabled if SCOABSPATH is set to a
+    # non-empty value in the environment.  Most likely only useful for
+    # creating official distributions of packages.
+    # This is a hack until libtool officially supports absolute path
+    # names for shared libraries.
+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+    runpath_var='LD_RUN_PATH'
+
+    case $cc_basename in
+      CC*)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      *)
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+    esac
+    ;;
+  tandem*)
+    case $cc_basename in
+      NCC*)
+	# NonStop-UX NCC 3.20
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+      *)
+	# FIXME: insert proper C++ library support
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	;;
+    esac
+    ;;
+  vxworks*)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  *)
+    # FIXME: insert proper C++ library support
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+esac
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+int a;
+void foo (void) { a = 0; }
+EOF
+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+EOF
+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+EOF
+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  # 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"`
+
+  for p in `eval $output_verbose_link_cmd`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" \
+	  || test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$rm -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+interix3*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_AC_TAGVAR(predep_objects,$1)=
+  _LT_AC_TAGVAR(postdep_objects,$1)=
+  _LT_AC_TAGVAR(postdeps,$1)=
+  ;;
+
+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
+])# AC_LIBTOOL_POSTDEP_PREDEP
+
+# AC_LIBTOOL_LANG_F77_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+
+# Code to be used in simple link tests
+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
+_LT_CC_BASENAME([$compiler])
+
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+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
+aix3*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+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])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_F77_CONFIG
+
+
+# AC_LIBTOOL_LANG_GCJ_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+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'
+
+# 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
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_GCJ_CONFIG
+
+
+# AC_LIBTOOL_LANG_RC_CONFIG
+# -------------------------
+# Ensure that the configuration vars for the Windows resource compiler are
+# suitably defined.  Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+
+# Code to be used in simple link tests
+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)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_RC_CONFIG
+
+
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars.  Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+AC_DEFUN([AC_LIBTOOL_CONFIG],
+[# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  # 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
+  # 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 EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+    SED SHELL STRIP \
+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+    deplibs_check_method reload_flag reload_cmds need_locks \
+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+    lt_cv_sys_global_symbol_to_c_name_address \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    old_postinstall_cmds old_postuninstall_cmds \
+    _LT_AC_TAGVAR(compiler, $1) \
+    _LT_AC_TAGVAR(CC, $1) \
+    _LT_AC_TAGVAR(LD, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+    _LT_AC_TAGVAR(predep_objects, $1) \
+    _LT_AC_TAGVAR(postdep_objects, $1) \
+    _LT_AC_TAGVAR(predeps, $1) \
+    _LT_AC_TAGVAR(postdeps, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(archive_cmds, $1) \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+    _LT_AC_TAGVAR(module_cmds, $1) \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+    _LT_AC_TAGVAR(include_expsyms, $1); do
+
+    case $var in
+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_cmds, $1) | \
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(module_cmds, $1) | \
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case $lt_echo in
+  *'\[$]0 --fallback-echo"')
+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+    ;;
+  esac
+
+ifelse([$1], [],
+  [cfgfile="${ofile}T"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  $rm -f "$cfgfile"
+  AC_MSG_NOTICE([creating $ofile])],
+  [cfgfile="$ofile"])
+
+  cat <<__EOF__ >> "$cfgfile"
+ifelse([$1], [],
+[#! $SHELL
+
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# 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., 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.
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e 1s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# The names of the tagged configurations supported by this script.
+available_tags=
+
+# ### BEGIN LIBTOOL CONFIG],
+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+
+# Whether or not to optimize for fast installation.
+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
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
+# A language-specific compiler.
+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+# Is the compiler the GNU C compiler?
+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+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?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+
+# Symbols that must always be exported.
+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+
+ifelse([$1],[],
+[# ### END LIBTOOL CONFIG],
+[# ### END LIBTOOL TAG CONFIG: $tagname])
+
+__EOF__
+
+ifelse([$1],[], [
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "$cfgfile"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" || \
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+])
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
+fi
+])# AC_LIBTOOL_CONFIG
+
+
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# 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'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+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'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  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]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+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'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -f conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | os2* | pw32*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix4* | aix5*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	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++*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | kfreebsd*-gnu | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  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.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  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'
+	    ;;
+	  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.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+	;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  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
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  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*)
+	    # Green Hills C++ Compiler
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _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'
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      ;;
+
+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    interix3*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    hpux*)
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_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
+      # built for inclusion in a dll (and should export symbols for example).
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _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
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    linux*)
+      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.
+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      esac
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _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*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _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'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _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'
+      ;;
+
+    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'
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
   fi
 ])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+])
+
 
-dnl old names
-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix4* | aix5*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _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 '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  kfreebsd*-gnu)
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+  ;;
+  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'
+  ;;
+  esac
+],[
+  runpath_var=
+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_AC_TAGVAR(archive_cmds, $1)=
+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+  _LT_AC_TAGVAR(module_cmds, $1)=
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_AC_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # 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
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # 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*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we can't use
+      # them.
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _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 '\''/^[[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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix3*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    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* | 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=
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+      elif $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'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  else
+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      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'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    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)
+    case $host_os in
+    aix3*)
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	  for ld_flag in $LDFLAGS; do
+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+  	    aix_use_runtimelinking=yes
+  	    break
+  	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_AC_TAGVAR(archive_cmds, $1)=''
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+      if test "$GCC" = yes; then
+	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`
+	  if test -f "$collect2name" && \
+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  then
+  	  # We have reworked collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  else
+  	  # We have old collect2
+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+  	  # It fails to find uninstalled libraries when the uninstalled
+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+  	  # to unsupported forces relinking
+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	  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
+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+  	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+       else
+	if test "$host_cpu" = ia64; then
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an empty executable.
+	 _LT_AC_SYS_LIBPATH_AIX
+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # 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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      # see comment about different semantics on the GNU ld section
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    bsdi[[45]]*)
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      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'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    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
+    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
+      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
+      ;;
+
+    dgux*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    freebsd1*)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | 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
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+      
+    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
+    kfreebsd*-gnu)
+      _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
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $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)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    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
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    openbsd*)
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _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
+       case $host_os in
+	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	   ;;
+	 *)
+	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	   ;;
+       esac
+      fi
+      ;;
+
+    os2*)
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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'
+      else
+	_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 ${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'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    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'
+      fi
+      _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]].*) ;;
+      *)
+ 	# 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
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+  fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $rm conftest*
+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $rm conftest*
+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
+
+
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
+
+
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
+
+AC_DEFUN([LT_AC_PROG_GCJ],
+[AC_CHECK_TOOL(GCJ, gcj, no)
+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+  AC_SUBST(GCJFLAGS)
+])
+
+AC_DEFUN([LT_AC_PROG_RC],
+[AC_CHECK_TOOL(RC, windres, no)
+])
+
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+lt_ac_max=0
+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 && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_MSG_RESULT([$SED])
+])
diff --git a/m4extra/progtest.m4 b/m4extra/progtest.m4
index 2482d4a..a56365c 100644
--- a/m4extra/progtest.m4
+++ b/m4extra/progtest.m4
@@ -1,44 +1,89 @@
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# progtest.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-# serial 1
+AC_PREREQ(2.50)
+
+# Search path for a program which passes the given test.
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
-[# Extract the first word of "$2", so it can be a program name with args.
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
 AC_CACHE_VAL(ac_cv_path_$1,
 [case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
 dnl If no 4th arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
 ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
 ])dnl
-  ;;
+    ;;
 esac])dnl
 $1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
   AC_MSG_RESULT([$]$1)
 else
   AC_MSG_RESULT(no)
diff --git a/man/Makefile.in b/man/Makefile.in
index f210fd5..07dc610 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -281,10 +281,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/po/cs.gmo b/po/cs.gmo
index 086fc4d..5777e2a 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index c96dc3d..f058d6f 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -16,6 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "Nastavit implicitní"
@@ -285,9 +286,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400×600 DPI"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Normální papír"
 
@@ -297,9 +298,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Normální papír"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Fólie"
 
@@ -340,9 +341,10 @@ msgid "Photo Paper Pro"
 msgstr "Profesionální fotopapír"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Jiný"
 
@@ -406,7 +408,7 @@ msgstr "Zdroj (vstupní otvor) média, na které tisknete"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Rozlišení"
 
@@ -547,9 +549,9 @@ msgstr "Světle modrozelená"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -567,8 +569,8 @@ msgid "Light Yellow Transition"
 msgstr "Světle modrozelená"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -598,12 +600,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Černá"
 
@@ -623,14 +627,14 @@ msgstr "Fotografické barvy CcMmY"
 msgid "Photo CcMmYK Color"
 msgstr "Fotografické barvy CcMmYK"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Barva"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -671,8 +675,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Vytisknout"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Odstíny šedi"
@@ -833,12 +837,14 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Modrozelená"
 
@@ -847,12 +853,14 @@ msgstr "Modrozelená"
 msgid "Adjust the cyan gamma"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -861,12 +869,14 @@ msgstr "Fialová"
 msgid "Adjust the magenta gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Žlutá"
 
@@ -875,9 +885,10 @@ msgstr "Žlutá"
 msgid "Adjust the yellow gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -886,8 +897,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -896,9 +907,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1137,7 +1149,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1228,134 +1240,145 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standardní"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "Podávací válec"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr "Podávací válec (odříznout každou stranu)"
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr "Podávací válec (neodřezávat)"
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Ru�ní"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tisknout do souboru?"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr "Přihrádka řezaných listů 1"
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr "Přihrádka řezaných listů 2"
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výběr řezaných listů"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr "Ru�ní výběr"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Výška:"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografie"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Å est barev foto"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Světle modrozelená"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Světle fialová"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Černá"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Černá/tmavá žlutá"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matný papír"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapír"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý potah"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Černá"
@@ -1602,86 +1625,78 @@ msgstr "Světle modrozelená"
 msgid "Medium Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tisknout do souboru?"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ru�ní"
 
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1735,104 +1750,105 @@ msgid "test print"
 msgstr "testovací tisk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 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: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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 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: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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Pět barev foto kompozitní"
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Lesklý potah"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Obálky"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Matný papír"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 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: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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotopapír"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý papír ve foto kvalitě"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr ""
 
@@ -1840,8 +1856,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1981,8 +1997,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "Soubor PPD:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "Soubor PPD?"
@@ -1991,178 +2007,178 @@ msgstr "Soubor PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 msgid "Two Level Grayscale"
 msgstr "Dva úrovně stupňů šedi"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 msgid "Seven Color Photo"
 msgstr "Sedm barev foto"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Å est barev foto"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 msgid "Two Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tři barvy kompozitní"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tři barvy kompozitní"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Čtyři barvy standardní"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Čtyři barvy standardní"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Å est barev foto"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Sedm barev foto"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Å est barev foto"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Rychlé podávání normálního papíru"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Pohlednice"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr ""
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "Matný papír"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papír ColorLife"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matný papír"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2220,88 +2236,99 @@ msgstr "1200 DPI vysoká kvalita"
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Název tiskárny:"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Název tiskárny:"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
@@ -3707,645 +3734,698 @@ msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4443,30 +4523,30 @@ msgstr "Nastavit implicitní"
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "Budiž"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Tisk v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "O programu"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4474,7 +4554,7 @@ msgstr ""
 "Vytisknout a\n"
 "uložit nastavení"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4482,15 +4562,15 @@ msgstr ""
 "Uložit\n"
 "nastavení"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Vytisknout"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4514,74 +4594,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:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 msgid "Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Rozměry:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Šířka:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr "Šířka papíru, na který chcete tisknout"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Výška:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
 msgstr "Výška papíru, na který chcete tisknout"
 
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "Pozice"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Na výšku"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Na šířku"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "Vzhůru nohama"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Na stranu"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4589,124 +4669,124 @@ msgstr ""
 "Vyberte orientaci: na výšku, na šířku, vzhůru nohama nebo na stranu (na "
 "šířku vzhůru nohama)"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "Orientace:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "Levý:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 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:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Pravý:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Horní:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 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:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Spodní:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Vycentrovat:"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontálně"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Vycentrovat obrázek na papíře horizontálně"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Obojí"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Vycentrovat obrázek na papíře"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertikálně"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Vycentrovat obrázek na papíře vertikálně"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Nastavit tiskárnu"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Vyberte model své tiskárny"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Model tiskárny:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Vyberte model své tiskárny"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "Soubor PPD:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 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:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Procházet"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 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:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4715,54 +4795,54 @@ msgstr ""
 "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
 "tisknout"
 
-#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, 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:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "testovací tisk"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "Tisknout do souboru?"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 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:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "O Gimp-Print "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Verze Gimp-Print "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid ""
 "\n"
@@ -4807,11 +4887,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:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Nastavení tiskárny"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4819,11 +4899,11 @@ msgstr ""
 "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
 "tisknout"
 
-#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Nastavit tiskárnu..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4831,11 +4911,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:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "Nová tiskárna..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4843,24 +4923,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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "Typ obrázku"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Měřítko:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Nastavte měřítko (velikost) obrázku"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4868,31 +4948,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:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Procenta"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr "Upravit tisk na velikost stránky"
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
 msgstr "Upravit tisk na po�et bodů na palec"
 
-#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Nastavit šířku tisku"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Nastavit výšku tisku"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4900,67 +4980,67 @@ msgstr ""
 "Použít původní\n"
 "velikost obrázku"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 msgid "Set the print size to the size of the image"
 msgstr "Nastavit velikost tisku na velikost obrázku"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "Úprava barvy tisku"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Nastavit implicitní"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Náhled obrázku"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "Zvolte požadovaný typ výstupu"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Upravit výstup..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 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:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "Vyberte základní jednotku měření pro tisk"
 
@@ -5100,15 +5180,15 @@ msgstr "Czech"
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5377,18 +5457,19 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Nemohu �íst z %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5397,7 +5478,8 @@ msgstr ""
 "\n"
 "Nemohu zapisovat do %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5415,82 +5497,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:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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: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:976 src/escputil/escputil.c:1071
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Barva inkoustu"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Zbývá procent"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, fuzzy, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr "Tiskárna nepodporuje barevný výstup\n"
+
+#: src/escputil/escputil.c:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, 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:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Můžete zadat jen jeden model tiskárny."
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Čistím hlavy...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5563,7 +5645,7 @@ msgstr ""
 "abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
 "\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5627,12 +5709,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:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5651,13 +5733,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:1420 src/escputil/escputil.c:1427
-#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5665,7 +5747,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:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5674,7 +5756,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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5683,12 +5765,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:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Opakuji proces zarovnávání.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5703,17 +5785,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:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "Připravuji se uložit nastavení..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "selhalo!\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5722,27 +5804,27 @@ msgstr ""
 "Vaše nastavení nebylo uloženo úspěšně. Musíte zopakovat proceduru\n"
 "zarovnávání.\n"
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "uspělo!\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Nerozpoznaný příkaz.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Poslední příkaz nebyl potvrzen.\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5759,12 +5841,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:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Pokra�ujte stisknutím enter > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5774,42 +5856,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:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "Průchod #%d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, 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:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Číslo mimo rozsah!\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nemohu pochopit, co jste napsali!\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, 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:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Pokouším se nastavit zarovnání..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "uspělo.\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5822,7 +5904,7 @@ msgstr ""
 "vzorek %d. Pokud není, měli byste pro získání nejlepší kvality tisku proces\n"
 "zopakovat.\n"
 
-#: src/escputil/escputil.c:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "Chyba ve vstupu\n"
@@ -5959,6 +6041,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Získání dalšího řádku selhalo na %.0f\n"
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Nemohu zpracovat výstup z tiskárny\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "Žlutá"
 
diff --git a/po/da.gmo b/po/da.gmo
index cc7b8be..30bd928 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 5d363c4..25303ec 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -20,6 +20,7 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 msgid "Default"
 msgstr "Standard"
 
@@ -265,9 +266,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400x2400 DPI DMT"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Almindeligt papir"
 
@@ -276,9 +277,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Almindeligt papir PIXMA"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Transparenter"
 
@@ -319,9 +320,10 @@ msgid "Photo Paper Pro"
 msgstr "Prof. fotopapir"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Andet"
 
@@ -381,7 +383,7 @@ msgstr "I hvilken bakke er mediet"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Opløsning"
 
@@ -511,9 +513,9 @@ msgstr "Lys cyan overgang"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr "Avanceret blækjustering"
 
@@ -529,8 +531,8 @@ msgid "Light Yellow Transition"
 msgstr "Lys gul overgang"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr "Afbrudt"
 
@@ -560,12 +562,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Sort"
 
@@ -585,14 +589,14 @@ msgstr "Foto CcMmY farver"
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK farver"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farver"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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"
@@ -630,8 +634,8 @@ msgstr "Ingen korrektioner"
 msgid "Pre-Dithered"
 msgstr "Forud dithered"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Gråtone"
@@ -777,12 +781,14 @@ msgstr "Program gamma"
 msgid "Gamma value assumed by application"
 msgstr "Gammaværdi som formodet af program"
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -790,12 +796,14 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Justér gamma for cyan"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -803,12 +811,14 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Justér gamma for magenta"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Gul"
 
@@ -816,9 +826,10 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr "Justér gamma for gul"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr "Rød"
 
@@ -826,8 +837,8 @@ msgstr "Rød"
 msgid "Adjust the red gamma"
 msgstr "Justér gamma for rød"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr "Grøn"
 
@@ -835,9 +846,10 @@ msgstr "Grøn"
 msgid "Adjust the green gamma"
 msgstr "Justér gamma for grøn"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr "Blå"
 
@@ -1047,7 +1059,7 @@ msgstr "Grå bestanddels reduktion"
 msgid "Gray component reduction curve"
 msgstr "Grå bestanddels reduktionskurve"
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditionel Gutenprint farveomsætning"
 
@@ -1139,121 +1151,132 @@ 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: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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "Rulle fødning"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr "Rulle fødning (skær efter hver side)"
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr "Rulle fødning (ingen afskæring)"
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 msgid "Manual Feed"
 msgstr "Manuel fødning"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 msgid "Print to CD"
 msgstr "Udskriv på Cd"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr "Tilskårne ark, bakke 1"
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr "Tilskårne ark, bakke 2"
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisk valg af bakke"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr "Manuel udvælgelse"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr "Hurtig økonomisk"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr "Økonomisk"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 msgid "High"
 msgstr "Høj"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 msgid "Photo"
 msgstr "Foto"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr "Super foto"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr "Ultra foto"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr "Bedst"
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 msgid "Light Black"
 msgstr "Lys sort"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 msgid "Dark Yellow"
 msgstr "Mørk gul"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 msgid "Matte Black"
 msgstr "Mat sort"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 msgid "Photo Black"
 msgstr "Foto sort"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 msgid "Gloss Optimizer"
 msgstr "Glans forbedrer"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Lys sort"
@@ -1474,81 +1497,73 @@ msgstr "Mellemgrå overgang"
 msgid "Medium Gray Transition"
 msgstr "Middelgrå overgang"
 
-#: 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: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:1387
+#: src/main/print-escp2.c:1443
 msgid "Full Manual Control"
 msgstr "Fuld manuel kontrol"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr "Automatisk indstillingskontrol"
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "Cd - 12 cm"
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "Cd - 8 cm"
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 msgid "Print To Hub"
 msgstr "Print til center"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manuel kontrol"
 
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 msgid "Bidirectional"
 msgstr "Tovejs"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 msgid "Unidirectional"
 msgstr "Envejs"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr "Alternativ udfyldning"
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr "Stigende udfyldning"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr "Aftagende udfyldning"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr "Stigende dobbelt"
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vige udenom nærmeste nabo"
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 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"
@@ -1602,104 +1617,105 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 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: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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 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: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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Fem farver foto sammensat"
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Blanke film"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Kuverter"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Mat papir"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Inkjetpapir"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokvalitets inkjetpapir"
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Førsteklasses blankt fotopapir"
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Førsteklasses glittet fotopapir"
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokvalitets blankt papir"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Papir"
 
@@ -1707,8 +1723,8 @@ msgstr "Ilford Heavy Papir"
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr "Ingen"
 
@@ -1840,8 +1856,8 @@ msgstr "Lang kant (standard)"
 msgid "PPDFile"
 msgstr "PPDfil"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 msgid "PPD File"
 msgstr "PPD fil"
 
@@ -1849,164 +1865,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:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 msgid "Two Level Grayscale"
 msgstr "To-niveau gråskala"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr "FireTone grå"
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr "Seks farver forbedret sammensat"
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 msgid "Seven Color Photo"
 msgstr "Syv farver foto"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr "Syv farver forbedret"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Seks farver foto"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 msgid "One Color Raw"
 msgstr "En farve ufiltreret"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 msgid "One Color Raw Enhanced Gloss"
 msgstr "En farve ufiltreret forbedret glans"
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 msgid "Two Color Raw"
 msgstr "To farver ufiltreret"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 msgid "Three Color Raw"
 msgstr "Tre farver ufiltreret"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 msgid "Three Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans "
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 msgid "Four Color Raw"
 msgstr "Fire farver ufiltreret"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 msgid "Four Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 msgid "Five Color Raw"
 msgstr "Fem farver ufiltreret"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 msgid "Six Color Raw"
 msgstr "Seks farver ufiltreret"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seks farver forbedret glans ufiltreret"
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 msgid "Seven Color Raw"
 msgstr "Syv farver ufiltreret"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Syv farver forbedret glans ufiltreret"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr "Epson standard blæk"
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome foto sort"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome mat sort"
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Almindeligt papir hurtigindføring"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkort"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr "Baglys film"
 
-#: 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: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 "Matte Paper Heavyweight"
+msgstr "Heavyweight mat papir"
+
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium silkemat fotopapir"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 msgid "ColorLife Paper"
 msgstr "ColorLife papir"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 msgid "Archival Matte Paper"
 msgstr "Arkivfast mat papir"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr "Vandfarvepapir - strålende hvidt"
 
@@ -2055,79 +2071,90 @@ msgstr "720 DPI høj kvalitet"
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "720x720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr "Tændt"
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 msgid "Interleave"
 msgstr "Udjævning"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr "Fuld overlapning"
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr "Fire gennemløb"
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr "Fuld overlapning 2"
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 msgid "Interleave 2"
 msgstr "Udjævning 2"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 msgid "Eight Pass"
 msgstr "Otte gennemløb"
 
@@ -2843,7 +2870,7 @@ msgstr "Canon PIXMA iP4000"
 #: src/main/xmli18n-tmp.h:169
 #, fuzzy
 msgid "EPSON Stylus C20"
-msgstr "EPSON Stylus C20SX"
+msgstr "EPSON Stylus C20UX"
 
 #: src/main/xmli18n-tmp.h:170
 msgid "EPSON Stylus C20SX"
@@ -2856,7 +2883,7 @@ msgstr "EPSON Stylus C20UX"
 #: src/main/xmli18n-tmp.h:172
 #, fuzzy
 msgid "EPSON Stylus C40"
-msgstr "EPSON Stylus C40SX"
+msgstr "EPSON Stylus C40UX"
 
 #: src/main/xmli18n-tmp.h:173
 msgid "EPSON Stylus C40SX"
@@ -2869,7 +2896,7 @@ msgstr "EPSON Stylus C40UX"
 #: src/main/xmli18n-tmp.h:175
 #, fuzzy
 msgid "EPSON Stylus C41"
-msgstr "EPSON Stylus C41SX"
+msgstr "EPSON Stylus C41UX"
 
 #: src/main/xmli18n-tmp.h:176
 msgid "EPSON Stylus C41SX"
@@ -2882,7 +2909,7 @@ msgstr "EPSON Stylus C41UX"
 #: src/main/xmli18n-tmp.h:178
 #, fuzzy
 msgid "EPSON Stylus C42"
-msgstr "EPSON Stylus C42SX"
+msgstr "EPSON Stylus C42UX"
 
 #: src/main/xmli18n-tmp.h:179
 msgid "EPSON Stylus C42SX"
@@ -2895,7 +2922,7 @@ msgstr "EPSON Stylus C42UX"
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
 msgid "EPSON Stylus C43"
-msgstr "EPSON Stylus C43SX"
+msgstr "EPSON Stylus C43UX"
 
 #: src/main/xmli18n-tmp.h:182
 msgid "EPSON Stylus C43SX"
@@ -2908,7 +2935,7 @@ msgstr "EPSON Stylus C43UX"
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
 msgid "EPSON Stylus C44"
-msgstr "EPSON Stylus C44SX"
+msgstr "EPSON Stylus C44UX"
 
 #: src/main/xmli18n-tmp.h:185
 msgid "EPSON Stylus C44SX"
@@ -3389,632 +3416,685 @@ msgstr "EPSON Stylus CX3650"
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "EPSON Stylus CX3700"
-msgstr "EPSON Stylus CX3100"
+msgstr "EPSON Stylus CX8300"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "EPSON Stylus CX3800"
-msgstr "EPSON Stylus CX3100"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "EPSON Stylus C85"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
-msgstr "EPSON Stylus CX3200"
+msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:309
 msgid "EPSON Stylus CX4600"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
-msgstr "EPSON Stylus CX4600"
+msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
-msgstr "EPSON Stylus CX4600"
+msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 msgid "EPSON Stylus CX5100"
 msgstr "EPSON Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 msgid "EPSON Stylus CX5200"
 msgstr "EPSON Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 msgid "EPSON Stylus CX5300"
 msgstr "EPSON Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 msgid "EPSON Stylus CX5400"
 msgstr "EPSON Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "EPSON Stylus CX6500"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
-msgstr "EPSON Stylus CX1500"
+msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 msgid "EPSON Stylus CX6300"
 msgstr "EPSON Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 msgid "EPSON Stylus CX6400"
 msgstr "EPSON Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 msgid "EPSON Stylus CX6500"
 msgstr "EPSON Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 msgid "EPSON Stylus CX6600"
 msgstr "EPSON Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
-msgstr "EPSON Stylus CX8300"
+msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 msgid "EPSON Stylus CX8300"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 msgid "EPSON Stylus CX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "EPSON Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "EPSON Stylus C50"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr "EPSON CL-700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr "EPSON CL-750"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr "EPSON CL-760"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "EPSON EM-900C"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr "EPSON EM-900C"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr "EPSON EM-930C"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr "EPSON MC-2000"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr "EPSON MC-5000"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr "EPSON MC-7000"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr "EPSON MC-9000"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr "EPSON MC-10000"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr "EPSON MJ-930C"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr "EPSON MJ-6000C"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr "EPSON PM-700C"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr "EPSON PM-730C"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr "EPSON PM-740C"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr "EPSON PM-750C"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr "EPSON PM-760C"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr "EPSON PM-780C"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr "EPSON PM-800C"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr "EPSON PM-870C"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr "EPSON PM-880C"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr "EPSON PM-930C"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr "EPSON PM-940C"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr "EPSON PM-950C"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr "EPSON PM-970C"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr "EPSON PM-980C"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "EPSON PM-9000C"
+
+#: src/main/xmli18n-tmp.h:379
 msgid "EPSON PM-D750"
 msgstr "EPSON PM-D750"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 msgid "EPSON PM-D770"
 msgstr "EPSON PM-D770"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 msgid "EPSON PM-D1000"
 msgstr "EPSON PM-D1000"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PM-G700"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PM-G720"
 msgstr "EPSON PM-G720"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 msgid "EPSON PM-G800"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 msgid "EPSON PM-G820"
 msgstr "EPSON PM-G820"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "EPSON PX-V600"
+
+#: src/main/xmli18n-tmp.h:387
 msgid "EPSON PX-G900"
 msgstr "EPSON PX-G900"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 msgid "EPSON PX-G920"
 msgstr "EPSON PX-G920"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 msgid "EPSON PX-G5000"
 msgstr "EPSON PX-G5000"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 msgid "EPSON PX-V500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 msgid "EPSON PX-V600"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "EPSON PX-V500"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr "EPSON PX-7000"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr "HP DesignJet 2500C"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr "HP DesignJet 3500C"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr "HP DeskJet 600/600C"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr "HP DeskJet 600 series"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr "HP DeskJet 690 series"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr "HP DeskJet 900 series"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr "HP DeskJet 2000 series"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr "HP DeskJet 2500 series"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr "HP LaserJet II series"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr "HP LaserJet IIP series"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr "HP LaserJet III series"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr "HP LaserJet 4 series"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr "HP LaserJet 5 series"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr "HP LaserJet 6 series"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr "Olympus P200"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr "Olympus P400"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr "Olympus P440"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 #, fuzzy
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
@@ -4104,30 +4184,30 @@ msgstr "Sæt som standard"
 msgid "Restore Previous"
 msgstr "Genskab forrige"
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "O.k"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Annullér"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Udskriv v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4135,7 +4215,7 @@ msgstr ""
 "    Print og\n"
 "gem opsætning"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4143,15 +4223,15 @@ msgstr ""
 "    Gem\n"
 "opsætning"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Smugkig"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4175,73 +4255,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:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 msgid "Paper Size"
 msgstr "Papirstørrelse"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr "Vis alle papirstørrelser"
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Størrelser:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Bredde:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr "Bredden af det papir der skal udskrives på"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Højde:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 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:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 msgid "Automatic Paper Size"
 msgstr "Automatisk papirstørrelse"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr "Antal kopier"
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 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:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 msgid "Image Position"
 msgstr "Billedposition"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Portræt"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Tværformat"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "Vendt op/ned"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Tværformat vendt op/ned"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4249,119 +4329,119 @@ msgstr ""
 "Vælg papirretning: portræt, tværformat eller portræt og tværformat vendt op/"
 "ned"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "Venstre:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 msgid "Distance from the left of the paper to the image"
 msgstr "Afstand fra venstre side af arket til billedet"
 
-#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Højre:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the right of the paper to the image"
 msgstr "Afstand fra højre papirkant til billedet"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Øverst:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the top of the paper to the image"
 msgstr "Afstand fra toppen af arket til billedet"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Nederst:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Centrér:"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Horizontal"
 msgstr "Vandret"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Centrér billedet i vandret på papiret"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Begge"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Centrér billedet på papiret"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Vertical"
 msgstr "Lodret"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Centrér billedet i lodret på papiret"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Indstil printer"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 msgid "Printer Make:"
 msgstr "Printer mærke:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 msgid "Select the make of your printer"
 msgstr "Vælg dit printermærke"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Printermodel:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Vælg din printermodel"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "PPD-fil:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Angiv korrekt PPD filnavn for printeren"
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Bladr igennem"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Vælg korrekt PPD filnavn for printeren"
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -4369,48 +4449,48 @@ msgstr ""
 "Vælg navnet på uddatakøen (hverken type eller model af printer) som du "
 "ønsker at printe til"
 
-#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 msgid "Printer Queue:"
 msgstr "Printerkø:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid "Enter the correct command to print to your printer. "
 msgstr "Angiv den korrekte kommando til printning på din printer. "
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr "Angiv hvilken fil du vil skrive til. "
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "File to print to"
 msgstr "Fil der skal skrives til"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 msgid "Print To File"
 msgstr "Udskriv til fil"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Definér ny printer"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Printernavn:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Angiv et navn til denne logiske printer"
 
-#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 msgid "About Gutenprint "
 msgstr "Om Gutenprint"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 msgid "Gutenprint Version "
 msgstr "Gutenprint version"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 msgid ""
 "\n"
 "\n"
@@ -4454,11 +4534,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:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Printer indstillinger"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4466,11 +4546,11 @@ msgstr ""
 "Vælg navnet på printeren (hverken type eller model af printer) som du ønsker "
 "at udskrive til"
 
-#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Opsætning printer..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4478,11 +4558,11 @@ msgstr ""
 "Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til "
 "denne printer"
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "Ny printer..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4490,23 +4570,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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 msgid "Image Size"
 msgstr "Billedstørrelse"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Skalering:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Angiv skalering (størrelse) af billedet"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr "Skalér med:"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4514,31 +4594,31 @@ msgstr ""
 "Vælg om skalering måles i procent af valgt sidestørrelse, eller antal af "
 "udskriftspunkter pr. tomme"
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr "Skalér udskriften til arkstørrelsen"
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skalér udskriften til antal punkter pr. tomme"
 
-#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Angiv bredden af udskriften"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Angiv højden på udskriften"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4546,64 +4626,64 @@ msgstr ""
 "Brug original\n"
 "billedstørrelse"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 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:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "Udskrifts-farvejustering"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Sæt til standardværdier"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Luk"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Smugkig af billede"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr "Vis udskriftskanaler:"
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 msgid "Output"
 msgstr "Udskrift"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Udskriftstype:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "Vælg den ønskede udskriftstype"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Justér udskrift..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 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:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 msgid "Size Units:"
 msgstr "Mål-enhed:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Enheder:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "Vælg basisenhed for målangivelse ved printning"
 
@@ -4733,15 +4813,15 @@ msgstr "Danish"
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
@@ -5015,18 +5095,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5035,7 +5116,8 @@ msgstr ""
 "\n"
 "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5055,83 +5137,83 @@ msgstr ""
 "Kan ikke detektere printertype.\n"
 "Brug -m for at specificere din printermodel.\n"
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr "blækniveauer"
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr "status"
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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:917 src/escputil/escputil.c:1138
-#, c-format
-msgid "Cannot identify printer!\n"
-msgstr "Kan ikke identificere printeren!\n"
-
-#: 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:976 src/escputil/escputil.c:1071
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Blæk farve"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Procent tilbage"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, 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:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr "Del nummer"
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr "Dato"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Printeridentifikation forudsætter en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1289
+#: src/escputil/escputil.c:1389
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Kan ikke identificere printermodel.\n"
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Renser hoveder...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5209,7 +5291,7 @@ msgstr ""
 "processen løber.\n"
 "\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5282,12 +5364,12 @@ msgstr ""
 "processen løber.\n"
 "\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5306,19 +5388,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:1420 src/escputil/escputil.c:1427
-#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, 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:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5327,19 +5409,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:1437
+#: src/escputil/escputil.c:1537
 #, 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:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Gentager processen med at retten-ind.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5354,17 +5436,17 @@ msgstr ""
 "Bekræft ved at taste 's' igen, at du vil gemme indstillingerne i din "
 "printer:\n"
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "Klar til at gemme indstillingerne..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "mislykkedes!\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5373,27 +5455,27 @@ msgstr ""
 "Dine indstillinger blev ikke gemt korrekt. Du skal gentage retten-ind\n"
 "processen.\n"
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "lykkedes!\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Kommandoen blev ikke genkendt.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Afsluttende kommando blev ikke bekræftet.\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5410,12 +5492,12 @@ msgstr ""
 "Placer et ark papir i printeren, og begynd retten-ind\n"
 "processen af print hovedet.\n"
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Tryk på enter-tasten for at fortsætte > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5425,42 +5507,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:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "Gennemløb #%d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Indsæt et nyt ark papir.\n"
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Antal uden for givet område!\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Jeg kan ikke tolke hvad du tastede!\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, 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:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Prøver at sætte retten-ind..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "lykkedes.\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5474,7 +5556,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:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "Fejl i inddata\n"
@@ -5620,5 +5702,14 @@ msgstr "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 
+#~ msgid "Red and Blue Ink Usage"
+#~ msgstr "Brug af rødt og blåt blæk"
+
+#~ msgid "Amount of red and blue ink to use"
+#~ msgstr "Mængde af rødt og blåt blæk der skal bruges"
+
 #~ msgid "unknown"
 #~ msgstr "ukendt"
+
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Kan ikke identificere printeren!\n"
diff --git a/po/de.gmo b/po/de.gmo
index 6dbdcf1..3e4e84f 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index d65f7cd..a18eca9 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -16,6 +16,7 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "Zurücksetzen"
@@ -292,9 +293,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400×600 DPI"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Normalpapier"
 
@@ -304,9 +305,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Normalpapier"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Folie"
 
@@ -347,9 +348,10 @@ msgid "Photo Paper Pro"
 msgstr "Foto Papier Pro"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Anderes"
 
@@ -413,7 +415,7 @@ msgstr "in welchem Schacht ist das Druckmedium"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Auflösung"
 
@@ -554,9 +556,9 @@ msgstr "helles Cyan"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -574,8 +576,8 @@ msgid "Light Yellow Transition"
 msgstr "helles Cyan"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -605,12 +607,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Schwarz"
 
@@ -630,14 +634,14 @@ msgstr "Foto CcMmY Farbe"
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK Farbe"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farbe"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -678,8 +682,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Drucken"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Graustufen"
@@ -840,12 +844,14 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -854,12 +860,14 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -868,12 +876,14 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Gelb"
 
@@ -882,9 +892,10 @@ msgstr "Gelb"
 msgid "Adjust the yellow gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -893,8 +904,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -903,9 +914,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1145,7 +1157,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1236,135 +1248,146 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "Vorschub"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "Drucke in Datei?"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "autom. Auswahl"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Höhe:"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Foto"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Sieben Farb Foto"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "helles Cyan"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "helles Magenta"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Schwarz"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gelb"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Mattes Papier"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Foto Papier"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glossy Film"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Schwarz"
@@ -1611,87 +1634,79 @@ msgstr "helles Cyan"
 msgid "Medium Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Drucke in Datei?"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "Größe"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 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"
@@ -1745,104 +1760,105 @@ msgid "test print"
 msgstr "Probeausdruck"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 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: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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 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: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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Foto aus fünf Farben gemischt "
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Glossy Film"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Umschlag"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Mattes Papier"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Inkjet Papier"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Papier"
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Foto Papier"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Glanz Foto Papier"
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Papier"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr "Ilford schweres Papier"
 
@@ -1850,8 +1866,8 @@ msgstr "Ilford schweres Papier"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1991,8 +2007,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD Datei:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD Datei?"
@@ -2001,177 +2017,177 @@ msgstr "PPD Datei?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 msgid "Two Level Grayscale"
 msgstr "zweistufig Grau"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 msgid "One Color Raw"
 msgstr "einfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 msgid "Two Color Raw"
 msgstr "zweifarbige Rohausgabe"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 msgid "Four Color Raw"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 msgid "Six Color Raw"
 msgstr "Sechsfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 msgid "Seven Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Normalpapier Schnelleinzug"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkarte"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr "Durchlichtfolie"
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "Mattes Papier"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Normalpapier"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Mattes Papier"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2229,88 +2245,99 @@ msgstr "1200 DPI hohe Qualität"
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Drucker Name:"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Drucker Name:"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Helligkeit:"
@@ -3578,610 +3605,654 @@ msgid "EPSON Stylus CX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:304
-msgid "EPSON Stylus CX3810"
+msgid "EPSON Stylus CX3805"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:305
-msgid "EPSON Stylus CX4200"
+msgid "EPSON Stylus CX3810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:306
-msgid "EPSON Stylus CX4600"
+msgid "EPSON Stylus CX4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:307
-msgid "EPSON Stylus CX4700"
+msgid "EPSON Stylus CX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:308
-msgid "EPSON Stylus CX4800"
+msgid "EPSON Stylus CX4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:309
-msgid "EPSON Stylus CX5100"
+msgid "EPSON Stylus CX4600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:310
-msgid "EPSON Stylus CX5200"
+msgid "EPSON Stylus CX4700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:311
-msgid "EPSON Stylus CX5300"
+msgid "EPSON Stylus CX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:312
-msgid "EPSON Stylus CX5400"
+msgid "EPSON Stylus CX5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:313
-msgid "EPSON Stylus CX5800"
+msgid "EPSON Stylus CX5200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:314
-msgid "EPSON Stylus CX6300"
+msgid "EPSON Stylus CX5300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:315
-msgid "EPSON Stylus CX6400"
+msgid "EPSON Stylus CX5400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:316
-msgid "EPSON Stylus CX6500"
+msgid "EPSON Stylus CX5700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:317
-msgid "EPSON Stylus CX6600"
+msgid "EPSON Stylus CX5800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:318
-msgid "EPSON Stylus CX7700"
+msgid "EPSON Stylus CX6300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:319
-msgid "EPSON Stylus CX7800"
+msgid "EPSON Stylus CX6400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:320
-msgid "EPSON Stylus CX8300"
+msgid "EPSON Stylus CX6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:321
-msgid "EPSON Stylus CX8400"
+msgid "EPSON Stylus CX6600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:322
-msgid "EPSON Stylus D68"
+msgid "EPSON Stylus CX7700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:323
-msgid "EPSON Stylus D88"
+msgid "EPSON Stylus CX7800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:324
-msgid "EPSON Stylus DX3800"
+msgid "EPSON Stylus CX8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:325
-msgid "EPSON Stylus DX3850"
+msgid "EPSON Stylus CX8400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:326
-msgid "EPSON Stylus DX4200"
+msgid "EPSON Stylus D68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:327
-msgid "EPSON Stylus DX4800"
+msgid "EPSON Stylus D88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:328
-msgid "EPSON CL-700"
+msgid "EPSON Stylus DX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:329
-msgid "EPSON CL-750"
+msgid "EPSON Stylus DX3850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:330
-msgid "EPSON CL-760"
+msgid "EPSON Stylus DX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:331
-msgid "EPSON EM-900C"
+msgid "EPSON Stylus DX4250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:332
-msgid "EPSON EM-930C"
+msgid "EPSON Stylus DX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON MC-2000"
+msgid "EPSON PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON MC-5000"
+msgid "EPSON PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON MC-7000"
+msgid "EPSON CL-700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON MC-9000"
+msgid "EPSON CL-750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON MC-10000"
+msgid "EPSON CL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:338
-msgid "EPSON MJ-930C"
+msgid "EPSON E-100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON MJ-5100C"
+msgid "EPSON EM-900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON MJ-6000C"
+msgid "EPSON EM-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MJ-8000C"
+msgid "EPSON MC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON PM-700C"
+msgid "EPSON MC-5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON PM-730C"
+msgid "EPSON MC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON PM-740C"
+msgid "EPSON MC-9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON PM-750C"
+msgid "EPSON MC-10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON PM-760C"
+msgid "EPSON MJ-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON PM-770C"
+msgid "EPSON MJ-5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON PM-780C"
+msgid "EPSON MJ-6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON PM-790PT"
+msgid "EPSON MJ-8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-800C"
+msgid "EPSON PM-700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-850PT"
+msgid "EPSON PM-730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-870C"
+msgid "EPSON PM-740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-880C"
+msgid "EPSON PM-750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-930C"
+msgid "EPSON PM-760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-940C"
+msgid "EPSON PM-770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-950C"
+msgid "EPSON PM-780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-970C"
+msgid "EPSON PM-790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-980C"
+msgid "EPSON PM-800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-2000C"
+msgid "EPSON PM-850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-2200C"
+msgid "EPSON PM-870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-3000C"
+msgid "EPSON PM-880C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-3300C"
+msgid "EPSON PM-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-3500C"
+msgid "EPSON PM-940C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-3700C"
+msgid "EPSON PM-950C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-4000PX"
+msgid "EPSON PM-970C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-5000C"
+msgid "EPSON PM-980C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-7000C"
+msgid "EPSON PM-2000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-9000C"
+msgid "EPSON PM-2200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-10000"
+msgid "EPSON PM-3000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-D750"
+msgid "EPSON PM-3300C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-D770"
+msgid "EPSON PM-3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-D1000"
+msgid "EPSON PM-3700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-G700"
+msgid "EPSON PM-4000PX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-G720"
+msgid "EPSON PM-5000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-G800"
+msgid "EPSON PM-7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-G820"
+msgid "EPSON PM-9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PX-G900"
+msgid "EPSON PM-10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-msgid "EPSON PX-G920"
+msgid "EPSON PM-A900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-msgid "EPSON PX-G5000"
+msgid "EPSON PM-D750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-msgid "EPSON PX-V500"
+msgid "EPSON PM-D770"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-msgid "EPSON PX-V600"
+msgid "EPSON PM-D1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-msgid "EPSON PX-7000"
+msgid "EPSON PM-G700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-msgid "EPSON PX-9000"
+msgid "EPSON PM-G720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-msgid "Apple Color StyleWriter 4100"
+msgid "EPSON PM-G800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-msgid "Apple Color StyleWriter 4500"
+msgid "EPSON PM-G820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-msgid "Apple Color StyleWriter 6500"
+msgid "EPSON PX-A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-msgid "HP DeskJet 340"
+msgid "EPSON PX-G900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-msgid "HP DeskJet 400"
+msgid "EPSON PX-G920"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-msgid "HP DeskJet 500"
+msgid "EPSON PX-G5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-msgid "HP DesignJet 230"
+msgid "EPSON PX-V500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-msgid "HP DesignJet 250C"
+msgid "EPSON PX-V600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-msgid "HP DesignJet 700"
+msgid "EPSON PX-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "HP DesignJet 750C"
+msgid "EPSON PX-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "HP DesignJet 2500C"
+msgid "EPSON PX-9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "HP DesignJet 3500C"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:396
-msgid "HP DesignJet 430"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "HP DesignJet 450C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DesignJet 455CA"
+msgid "HP DeskJet 340"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DesignJet 488CA"
+msgid "HP DeskJet 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500C"
+msgid "HP DeskJet 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DeskJet 520"
+msgid "HP DesignJet 230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DeskJet 540C"
+msgid "HP DesignJet 250C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DeskJet 550C"
+msgid "HP DesignJet 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DeskJet 560C"
+msgid "HP DesignJet 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DeskJet 600/600C"
+msgid "HP DesignJet 2500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DeskJet 600 series"
+msgid "HP DesignJet 3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DeskJet 690 series"
+msgid "HP DesignJet 430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DeskJet 810C"
+msgid "HP DesignJet 450C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DeskJet 812C"
+msgid "HP DesignJet 455CA"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DeskJet 840C"
+msgid "HP DesignJet 488CA"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 842C"
+msgid "HP DeskJet 500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 845C"
+msgid "HP DeskJet 520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 850C"
+msgid "HP DeskJet 540C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 855C"
+msgid "HP DeskJet 550C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 870C"
+msgid "HP DeskJet 560C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 890C"
+msgid "HP DeskJet 600/600C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 895C"
+msgid "HP DeskJet 600 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 900 series"
+msgid "HP DeskJet 690 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 1100C"
+msgid "HP DeskJet 810C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 1120C"
+msgid "HP DeskJet 812C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 1200C"
+msgid "HP DeskJet 840C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 1220C"
+msgid "HP DeskJet 842C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 1600C"
+msgid "HP DeskJet 845C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 2000 series"
+msgid "HP DeskJet 850C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 2500 series"
+msgid "HP DeskJet 855C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP PhotoSmart P1000"
+msgid "HP DeskJet 870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP PhotoSmart P1100"
+msgid "HP DeskJet 890C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP LaserJet II series"
+msgid "HP DeskJet 895C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP LaserJet IIP series"
+msgid "HP DeskJet 900 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP LaserJet III series"
+msgid "HP DeskJet 1100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP LaserJet 4 series"
+msgid "HP DeskJet 1120C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP LaserJet 4L"
+msgid "HP DeskJet 1200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP LaserJet 4V"
+msgid "HP DeskJet 1220C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP LaserJet 4Si"
+msgid "HP DeskJet 1600C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP LaserJet 5 series"
+msgid "HP DeskJet 2000 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP LaserJet 5Si"
+msgid "HP DeskJet 2500 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP LaserJet 6 series"
+msgid "HP PhotoSmart P1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "Lexmark 4076"
+msgid "HP PhotoSmart P1100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "Lexmark Z42"
+msgid "HP LaserJet II series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "Lexmark Z43"
+msgid "HP LaserJet IIP series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "Lexmark Z52"
+msgid "HP LaserJet III series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "Lexmark Z53"
+msgid "HP LaserJet 4 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "Olympus P10"
+msgid "HP LaserJet 4L"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "Olympus P200"
+msgid "HP LaserJet 4V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "Olympus P300"
+msgid "HP LaserJet 4Si"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "Olympus P400"
+msgid "HP LaserJet 5 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "Olympus P440"
+msgid "HP LaserJet 5Si"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "Canon CP100"
+msgid "HP LaserJet 6 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Canon CP220"
+msgid "Lexmark 4076"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Sony UP-DP10"
+msgid "Lexmark Z42"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Sony UP-DR150"
+msgid "Lexmark Z43"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Fujifilm Printpix CX-400"
+msgid "Lexmark Z52"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Fujifilm Printpix CX-550"
+msgid "Lexmark Z53"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "RAW DATA 16 bit"
+msgid "Olympus P10"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
+msgid "Olympus P200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:456
+msgid "Olympus P300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:457
+msgid "Olympus P400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:458
+msgid "Olympus P440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:459
+msgid "Canon CP100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:460
+msgid "Canon CP220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:461
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:462
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:463
+msgid "Fujifilm Printpix CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:464
+msgid "Fujifilm Printpix CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:465
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4279,30 +4350,30 @@ msgstr "Zurücksetzen"
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Drucke v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "Über"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4310,7 +4381,7 @@ msgstr ""
 "Drucke und\n"
 "Sichere die Einstellungen"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4318,15 +4389,15 @@ msgstr ""
 "Sichere\n"
 "die Einstellungen"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Drucken"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4349,76 +4420,76 @@ msgstr ""
 "Das Drücken einer anderen Taste, während des Verschiebens, bringt das Bild "
 "in seine Ausgangsposition zurück."
 
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Maße:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Breite:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr "Breite des Papiers"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Höhe:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
 msgstr "Höhe des Papiers"
 
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "Position"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Aufrecht"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Querformat"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "umgekehrt Aufrecht"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "umgekehrt Querformat"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4426,124 +4497,124 @@ msgstr ""
 "wählen sie die Ausrichtung: Aufrecht, Querformat, umgekehrt Aufrecht, "
 "umgekehrt Querformat"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "Ausrichtung:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "links:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 msgid "Distance from the left of the paper to the image"
 msgstr "Entfernung vom linken Blattrand Bildrand"
 
-#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "rechts:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the right of the paper to the image"
 msgstr "Entfernung vom rechten Blattrand zum Bildrand"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Oben:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the top of the paper to the image"
 msgstr "Entfernung vom oberen Blattrand zum Bildrand"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "unten:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Entfernung vom unteren Blattrand zum Bild"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Zentrieren:"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "Waagerecht"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Bild waagerecht auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Beides"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Bild auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "senkrecht"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Bild senkrecht auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Drucker einrichten"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Wählen sie ihr Druckermodel"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Druckermodel:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Wählen sie ihr Druckermodel"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "PPD Datei:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 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:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Suchen"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 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:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4552,54 +4623,54 @@ msgstr ""
 "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
 "Modell...)"
 
-#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, 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:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "Probeausdruck"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "Drucke in Datei?"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 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:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Über Gimp-Print "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print Version "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid ""
 "\n"
@@ -4647,11 +4718,11 @@ msgstr ""
 "an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge,\n"
 "MA 02139, USA.\n"
 
-#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Drucker Einstellungen"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4659,11 +4730,11 @@ msgstr ""
 "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
 "Modell...)"
 
-#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Drucker einrichten..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4671,11 +4742,11 @@ msgstr ""
 "Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf "
 "diesem Drucker"
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "neuer Drucker..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4683,24 +4754,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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Zoom:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Einstellung der Bildgröße"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4708,31 +4779,31 @@ msgstr ""
 "Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen "
 "sollen"
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Prozent"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr "Bildgröße an Seitengröße anpassen"
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 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:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Einstellen der Breite des Ausdrucks"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Einstellen der Höhe des Ausdrucks"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4740,68 +4811,68 @@ msgstr ""
 "Benutze originale\n"
 "Bildgröße"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 msgid "Set the print size to the size of the image"
 msgstr "Ausdruckgröße gleich Bildgröße"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "Farbabstimmung"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Zurücksetzen"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Vorschau"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "Wählen sie die gewüschte Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Ausgabeeinstellungen.."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 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:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "Einheiten:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Einheiten:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "Wählen sie die Basismaßeinheit für das Drucken"
 
@@ -4942,15 +5013,15 @@ msgstr "German"
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5229,18 +5300,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5249,7 +5321,8 @@ msgstr ""
 "\n"
 "Kann auf %s: %s nicht schreiben\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5267,83 +5340,83 @@ msgstr ""
 "Kann den Druckertype nicht feststellen.\n"
 "Bitte nutzen sie die -m Option um das Model mitzuteilen.\n"
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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:927
-#, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "Drucker unterstützt keine Farbausgabe\n"
-
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Farbtinte"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Prozent verbleibend"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, fuzzy, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr "Drucker unterstützt keine Farbausgabe\n"
+
+#: src/escputil/escputil.c:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, 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:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Sie sollten nur ein Druckermodell angeben."
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Reinige die Köpfe...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5419,7 +5492,7 @@ msgstr ""
 "Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
 "\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5492,12 +5565,12 @@ msgstr ""
 "Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
 "\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5516,13 +5589,13 @@ msgstr ""
 "Sie werden um eine Bestätigung gebeten.\n"
 "Was möchten sie tun  (s, q, r)?\n"
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5530,7 +5603,7 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht "
 "sichern möchten\n"
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5539,7 +5612,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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5548,12 +5621,12 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n"
 "wiederholen möchten:\n"
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Wiederhole die Kopf-Ausrichtung.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5568,17 +5641,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:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "Wie man die Einstellungen sichert..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "gescheitert!\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5587,27 +5660,27 @@ msgstr ""
 "Die Sicherung ihrer Einstellungen scheiterte. Sie sollten \n"
 "die Kopf-Ausrichtung wiederholen. \n"
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "erledigt!\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Unbekannter Befehl.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Der letzte Befehl wurde nicht bestätigt.\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5623,12 +5696,12 @@ msgstr ""
 "\n"
 "Bitte legen sie ein Blatt Papier ein, um die Kopf-Ausrichtung zu beginnen.\n"
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Drücken sie Eingabe um fortzufahren > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5640,42 +5713,42 @@ msgstr ""
 "Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
 "wiederholen\n"
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "Durchgang #%d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Bitte legen sie ein neues Blatt ein.\n"
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Die Zahl ist ungültig!\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Wie bitte ?????\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, 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:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Beginne die Köpfe einzurichten..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "erledigt. \n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5688,7 +5761,7 @@ msgstr ""
 "mungen jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n"
 "Vorgang wiederholen.\n"
 
-#: src/escputil/escputil.c:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "Eingabefehler\n"
@@ -5825,6 +5898,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Zeilensprung gescheitert bei % 0f \n"
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Kann die Meldungen vom Drucker nicht deuten.\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "Stellen sie die Gelb-Balance ein"
 
diff --git a/po/el.gmo b/po/el.gmo
index d4b9a87..429ac50 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index df228e5..1b4c902 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -15,6 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
@@ -284,9 +285,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Êýñéá Óåëßäá"
@@ -297,9 +298,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Êýñéá Óåëßäá"
 
 #: 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
+#: 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
 #, fuzzy
 msgid "Transparencies"
 msgstr "ÄéáöáíÝò"
@@ -348,9 +349,10 @@ msgstr ""
 
 #
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "¶ëëá"
 
@@ -416,7 +418,7 @@ msgstr ""
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "ÁíÜëõóç"
 
@@ -559,9 +561,9 @@ msgstr "ØéëÞ Âñï÷Þ"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -579,8 +581,8 @@ msgid "Light Yellow Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -612,12 +614,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Ìáýñï"
 
@@ -642,14 +646,14 @@ msgid "Photo CcMmYK Color"
 msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò"
 
 #
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "×ñþìá"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -691,8 +695,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Åêôýðùóç"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
@@ -854,12 +858,14 @@ msgstr "ÃÜììá"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Êõáíü"
 
@@ -868,12 +874,14 @@ msgstr "Êõáíü"
 msgid "Adjust the cyan gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 #, fuzzy
 msgid "Magenta"
 msgstr "ìþâ"
@@ -883,12 +891,14 @@ msgstr "ìþâ"
 msgid "Adjust the magenta gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Êßôñéíï"
 
@@ -897,9 +907,10 @@ msgstr "Êßôñéíï"
 msgid "Adjust the yellow gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -908,8 +919,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -918,9 +929,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1160,7 +1172,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1248,136 +1260,147 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Êáíïíéêü"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 #, fuzzy
 msgid "Roll Feed"
 msgstr "Ñüëïò"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 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:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Åã÷åéñßäéï"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "ÁðåðéëïãÞ"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "¾øïò:"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Êñõðôïãñáößá"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Slashdot"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Slashdot"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Ìáýñï"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Êßôñéíï"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Êåßìåíá"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Ìáýñï"
@@ -1623,88 +1646,80 @@ msgstr "ØéëÞ Âñï÷Þ"
 msgid "Medium Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Byte Åîüäïõ"
 
 #
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 #, fuzzy
 msgid "Bidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1759,107 +1774,108 @@ msgid "test print"
 msgstr "Ôßôëïé ðñïò åêôýðùóç"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:869 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
 #, fuzzy
 msgid "Envelopes"
 msgstr "ÐñïãñáììáôéóôÝò"
 
-#: 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
+#: src/main/print-lexmark.c:873 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
 #, fuzzy
 msgid "Matte Paper"
 msgstr "×áñôß Ìáíßëá"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 #, fuzzy
 msgid "Photo Paper"
 msgstr "Êåßìåíá"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr ""
 
@@ -1867,8 +1883,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -2023,8 +2039,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: "
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr " Áñ÷åßï "
@@ -2033,183 +2049,183 @@ msgstr " Áñ÷åßï "
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Slashdot"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Êýñéá Óåëßäá"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 #, fuzzy
 msgid "Postcard"
 msgstr "Ôåëåõôáßá êáñôÝëá"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr "Åëáöñý ÷áëÜæé"
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "×áñôß Ìáíßëá"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2264,86 +2280,97 @@ msgstr ""
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Åñãáóßá"
@@ -3786,645 +3813,698 @@ msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4528,39 +4608,39 @@ msgid "Restore Previous"
 msgstr ""
 
 #
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "ÅíôÜîåé"
 
 #
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Áêýñùóç"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, fuzzy, c-format
 msgid "%s -- Print v%s"
 msgstr "%s Ýêäïóç %s"
 
 #
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "Ðåñß"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 #, fuzzy
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr "ÁðïèÞêåõóç Ñõèìßóåùí"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 #, fuzzy
 msgid ""
 "Save\n"
@@ -4568,16 +4648,16 @@ msgid ""
 msgstr "ÁðïèÞêåõóç Ñõèìßóåùí"
 
 #
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Åêôýðùóç"
 
 #
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Ðñïåðéóêüðçóç"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4592,59 +4672,59 @@ msgid ""
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "ÌÝãåèïò"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "ÄéáóôÜóåéò:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "ÐëÜôïò:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 #, fuzzy
 msgid "Width of the paper that you wish to print to"
 msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "¾øïò:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 #, fuzzy
 msgid "Height of the paper that you wish to print to"
 msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
 
 #
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "ÌÝãåèïò"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "ÈÝóç"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Áõôüìáôï"
 
@@ -4652,215 +4732,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:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Ðïñôñáßôï"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 #, fuzzy
 msgid "Upside down"
 msgstr "ÁíÜðïäá"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Tïðßï"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 #, fuzzy
 msgid "Orientation:"
 msgstr "Ðñïóáíáôïëéóìüò"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "ÁñéóôåñÜ:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 msgid "Distance from the left of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "ÄåîéÜ:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 #, fuzzy
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the right of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "ÐÜíù:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the top of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "ÊÜôù:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 msgid "Distance from the bottom of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 #, fuzzy
 msgid "Center:"
 msgstr "ÊÝíôñï"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "_Ïñéæüíôéá"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Êáé ôá äýï"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 #, fuzzy
 msgid "Center the image on the paper"
 msgstr "ÁëëáãÞ ôïõ ìåãÝèïõò óåëßäáò"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "Êáôáêüñõ_öá"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 #, fuzzy
 msgid "Center the image vertically on the paper"
 msgstr "ÐåñéóôñïöÞ åéêüíáò ãéá êÜèåôá ôáìðëþ"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Ñýèìéóç ÅêôõðùôÞ"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "¼íïìá åêôõðùôÞ:"
 
 #
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 #, fuzzy
 msgid "Printer Model:"
 msgstr "¼íïìá åêôõðùôÞ:"
 
 #
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 #, fuzzy
 msgid "Select your printer model"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 #, fuzzy
 msgid "PPD File:"
 msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: "
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Åîåñåýíçóç"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 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:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "Ôßôëïé ðñïò åêôýðùóç"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
 #
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 #, fuzzy
 msgid "Define New Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 #, fuzzy
 msgid "Printer Name:"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 #, fuzzy
 msgid "Enter the name you wish to give this logical printer"
 msgstr "ÅéóÜãåôå ôïí áñéèìü ãñáììÞò óôïí ïðïßï èÝëåôå íá ðÜôå."
 
-#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Óçìåßï ÐñïóÜñôçóçò: "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Åêôýðùóç óå: "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 msgid ""
 "\n"
 "\n"
@@ -4884,171 +4964,171 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 #, fuzzy
 msgid "Printer Settings"
 msgstr "Ñõèìßóåéò ÅðéëïãÝá"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 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:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 #, fuzzy
 msgid "Setup Printer..."
 msgstr "Ñýèìéóç ÅêôõðùôÞ"
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 #, fuzzy
 msgid "New Printer..."
 msgstr "Åêôýðùóç..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "ÌÝãåèïò"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 #, fuzzy
 msgid "Scaling:"
 msgstr "ÁðïèÞêåõóç:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 #, fuzzy
 msgid "Set the scale (size) of the image"
 msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Ðïóïóôü"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 #, fuzzy
 msgid "Scale the print to the size of the page"
 msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
 
 #
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 #, fuzzy
 msgid "PPI"
 msgstr "ÁÑÉÈÌ.ÄÉÅÑÃÁÓÉÁÓ"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 #, fuzzy
 msgid "Set the width of the print"
 msgstr "Ôï ðëÜôïò ôïõ ìáñáöåôéïý"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 #, fuzzy
 msgid "Set the height of the print"
 msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 #, fuzzy
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr "Áñ÷éêü _ÌÝãåèïò"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 #, fuzzy
 msgid "Set the print size to the size of the image"
 msgstr "Ïñéóìüò ðáñáìåôñïðïéçìÝíïõ ìåãÝèïõò ãéá ôçí åéêüíá"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 #, fuzzy
 msgid "Print Color Adjust"
 msgstr "Ðñùôåýùíôá ×ñþìáôá"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 #, fuzzy
 msgid "Set Defaults"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
 
 #
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Êëåßóéìï"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 #, fuzzy
 msgid "Image preview"
 msgstr "ÐáñáôçñçôÞò Åéêüíùí"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "Byte Åîüäïõ"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 #, fuzzy
 msgid "Output Type:"
 msgstr "Byte Åîüäïõ"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 #, fuzzy
 msgid "Select the desired output type"
 msgstr "ÅðéëïãÞ áñ÷åßïõ ðñïò áðïèÞêåõóç"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "&ÌïíÜäåò:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 #, fuzzy
 msgid "Units:"
 msgstr "&ÌïíÜäåò:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 #, fuzzy
 msgid "Select the base unit of measurement for printing"
 msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
@@ -5193,15 +5273,15 @@ msgstr "Greek"
 msgid "ISOLatin1"
 msgstr "ËÜôéí"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5381,25 +5461,27 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, fuzzy, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, fuzzy, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "ÅããñáöÞ áäýíáôç: %s"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr "ÅããñáöÞ áäýíáôç: %s"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5414,84 +5496,84 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr ""
-
-#: 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:927
 #, c-format
-msgid "Printer does not support listing ink types!\n"
+msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 #, fuzzy
 msgid "Ink color"
 msgstr " ÷ñþìá"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 #, fuzzy
 msgid "Percent remaining"
 msgstr "Åðß ôïéò åêáôü åëåýèåñï"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, fuzzy, c-format
 msgid "Cleaning heads...\n"
 msgstr "ÁíÜãíùóç åðéêåöáëßäùí..."
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5530,7 +5612,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5566,12 +5648,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5583,38 +5665,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1530
 #, 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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, fuzzy, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5624,44 +5706,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1476
+#: src/escputil/escputil.c:1576
 #, fuzzy, c-format
 msgid "Unrecognized command.\n"
 msgstr "Üãíùóôï ÷ñþìá: %s"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5672,13 +5754,13 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 #, fuzzy
 msgid "Press enter to continue > "
 msgstr "Ðáñáêáëþ åéóáãÜãåôå ìéá ãñáììÞ åíôïëþí ðáñáêÜôù."
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5686,43 +5768,43 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
 #
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, fuzzy, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Ðáñáêáëþ åéóÜãåôå 200 äñá÷ìÝò ãéá íá óõíå÷ßóåôå."
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, fuzzy, c-format
 msgid "Number out of range!\n"
 msgstr "Áñéèìüò Óåëßäùí"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, fuzzy, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Äåí êáôáëáâáßíù ôçí åíôïëÞ óïõ. "
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1600
+#: src/escputil/escputil.c:1700
 #, fuzzy, c-format
 msgid "Attempting to set alignment..."
 msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5731,7 +5813,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1650
+#: src/escputil/escputil.c:1750
 #, fuzzy, c-format
 msgid "Error in input\n"
 msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
@@ -5870,6 +5952,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Áäõíáìßá áíïßãìáôïò áñ÷åßïõ åîüäïõ: %s\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index b0459a4..abedb69 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index f5b5aff..3bc5e5f 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\n"
 "PO-Revision-Date: 2004-09-23 00:10+0100\n"
 "Last-Translator: Roger Leigh <rleigh@debian.org>\n"
 "Language-Team: British English\n"
@@ -15,6 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 msgid "Default"
 msgstr "Default"
 
@@ -262,9 +263,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400×2400 DPI DMT"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Plain Paper"
 
@@ -274,9 +275,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Plain Paper"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Transparencies"
 
@@ -317,9 +318,10 @@ msgid "Photo Paper Pro"
 msgstr "Photo Paper Pro"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Other"
 
@@ -379,7 +381,7 @@ msgstr "Source (input slot) of the media"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Resolution"
 
@@ -517,9 +519,9 @@ msgstr "Light Cyan Transition"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr "Advanced Ink Adjustment"
 
@@ -535,8 +537,8 @@ msgid "Light Yellow Transition"
 msgstr "Light Yellow Transition"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr "Off"
 
@@ -566,12 +568,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Black"
 
@@ -591,14 +595,14 @@ msgstr "Photo CcMmY Colour"
 msgid "Photo CcMmYK Color"
 msgstr "Photo CcMmYK Colour"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Colour"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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"
@@ -636,8 +640,8 @@ msgstr "Raw"
 msgid "Pre-Dithered"
 msgstr "Pre-Dithered"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Grayscale"
@@ -784,12 +788,14 @@ msgstr "AppGamma"
 msgid "Gamma value assumed by application"
 msgstr "Gamma value assumed by application"
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -797,12 +803,14 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Adjust the cyan gamma"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -810,12 +818,14 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Adjust the magenta gamma"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Yellow"
 
@@ -823,9 +833,10 @@ msgstr "Yellow"
 msgid "Adjust the yellow gamma"
 msgstr "Adjust the yellow gamma"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr "Red"
 
@@ -833,8 +844,8 @@ msgstr "Red"
 msgid "Adjust the red gamma"
 msgstr "Adjust the red gamma"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr "Green"
 
@@ -842,9 +853,10 @@ msgstr "Green"
 msgid "Adjust the green gamma"
 msgstr "Adjust the green gamma"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr "Blue"
 
@@ -1058,7 +1070,7 @@ msgstr "Gray Component Reduction"
 msgid "Gray component reduction curve"
 msgstr "Gray component reduction curve"
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditional Gutenprint colour conversion"
 
@@ -1150,127 +1162,138 @@ 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: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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "Roll Feed"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr "Roll Feed (cut each page)"
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr "Roll Feed (do not cut)"
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 msgid "Manual Feed"
 msgstr "Manual Feed"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 msgid "Print to CD"
 msgstr "Print to CD"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr "Cut Sheet Bin 1"
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr "Cut Sheet Bin 2"
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 msgid "Cut Sheet Autoselect"
 msgstr "Cut Sheet Autoselect"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr "Manual Selection"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr "Fast Economy"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr "Economy"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr "Draft"
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 msgid "High"
 msgstr "High"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 msgid "Photo"
 msgstr "Photo"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr "Super Photo"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr "Ultra Photo"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr "Best"
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Light Cyan/Red"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Light Magenta/Blue"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Black"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Black/Dark Yellow"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matte Paper"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Photo Paper"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 msgid "Gloss Optimizer"
 msgstr "Gloss Optimiser"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Black"
@@ -1508,81 +1531,73 @@ msgstr "Mid Gray Transition"
 msgid "Medium Gray Transition"
 msgstr "Medium Gray Transition"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 msgid "Full Manual Control"
 msgstr "Full Manual Control"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr "Automatic Setting Control"
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 msgid "Print To Hub"
 msgstr "Print To Hub"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manual Control"
 
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 msgid "Bidirectional"
 msgstr "Bidirectional"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 msgid "Unidirectional"
 msgstr "Unidirectional"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr "Alternate Fill"
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr "Ascending Fill"
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr "Descending Fill"
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr "Ascending Double"
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr "Nearest Neighbour Avoidance"
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 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"
@@ -1636,104 +1651,105 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 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: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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 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: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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Five Colour Photo Composite"
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Glossy Film"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Envelopes"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Matte Paper"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Inkjet Paper"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Paper"
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Photo Paper"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Photo Paper"
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Lustre Photo Paper"
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Paper"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
@@ -1742,8 +1758,8 @@ msgstr "Ilford Heavy Paper"
 msgid "Coated"
 msgstr "Card"
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr "None"
 
@@ -1877,8 +1893,8 @@ msgstr "Long Edge (Standard)"
 msgid "PPDFile"
 msgstr "PPDFile"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 msgid "PPD File"
 msgstr "PPD File"
 
@@ -1886,179 +1902,179 @@ msgstr "PPD File"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Image dimensions must match paper dimensions"
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Grayscale"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 #, fuzzy
 msgid "Six Color Enhanced Composite"
 msgstr "Five Colour Photo Composite"
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Six Colour Photo"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr ""
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Six Colour Photo"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 msgid "Two Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Three Colour Composite"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Three Colour Composite"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Four Colour Standard"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Four Colour Standard"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Six Colour Photo"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Ultra Photo"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Plain Paper"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postcard"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr "Back Print Film"
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "Matte Paper"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Glossy Photo Paper"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Core Parameter"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matte Paper"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2118,88 +2134,99 @@ msgstr "1200 DPI high quality"
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI highest quality"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "720×720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440×720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI highest quality"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440×720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880×2880 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI highest quality"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440×1440 DPI DMT"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880×2880 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880×2880 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Interleave Method"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Interleave Method"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Alignment Passes"
@@ -2923,7 +2950,7 @@ msgstr "Canon S400"
 #: src/main/xmli18n-tmp.h:169
 #, fuzzy
 msgid "EPSON Stylus C20"
-msgstr "EPSON Stylus C20SX"
+msgstr "EPSON Stylus C20UX"
 
 #: src/main/xmli18n-tmp.h:170
 msgid "EPSON Stylus C20SX"
@@ -2936,7 +2963,7 @@ msgstr "EPSON Stylus C20UX"
 #: src/main/xmli18n-tmp.h:172
 #, fuzzy
 msgid "EPSON Stylus C40"
-msgstr "EPSON Stylus C40SX"
+msgstr "EPSON Stylus C40UX"
 
 #: src/main/xmli18n-tmp.h:173
 msgid "EPSON Stylus C40SX"
@@ -2949,7 +2976,7 @@ msgstr "EPSON Stylus C40UX"
 #: src/main/xmli18n-tmp.h:175
 #, fuzzy
 msgid "EPSON Stylus C41"
-msgstr "EPSON Stylus C41SX"
+msgstr "EPSON Stylus C41UX"
 
 #: src/main/xmli18n-tmp.h:176
 msgid "EPSON Stylus C41SX"
@@ -2962,7 +2989,7 @@ msgstr "EPSON Stylus C41UX"
 #: src/main/xmli18n-tmp.h:178
 #, fuzzy
 msgid "EPSON Stylus C42"
-msgstr "EPSON Stylus C42SX"
+msgstr "EPSON Stylus C42UX"
 
 #: src/main/xmli18n-tmp.h:179
 msgid "EPSON Stylus C42SX"
@@ -2975,7 +3002,7 @@ msgstr "EPSON Stylus C42UX"
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
 msgid "EPSON Stylus C43"
-msgstr "EPSON Stylus C43SX"
+msgstr "EPSON Stylus C43UX"
 
 #: src/main/xmli18n-tmp.h:182
 msgid "EPSON Stylus C43SX"
@@ -2988,7 +3015,7 @@ msgstr "EPSON Stylus C43UX"
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
 msgid "EPSON Stylus C44"
-msgstr "EPSON Stylus C44SX"
+msgstr "EPSON Stylus C44UX"
 
 #: src/main/xmli18n-tmp.h:185
 msgid "EPSON Stylus C44SX"
@@ -3485,650 +3512,703 @@ msgstr "EPSON Stylus CX-3100"
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "EPSON Stylus CX3700"
-msgstr "EPSON Stylus CX-3100"
+msgstr "EPSON Stylus CX-8300"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "EPSON Stylus CX3800"
-msgstr "EPSON Stylus CX-3100"
+msgstr "EPSON Stylus CX-8400"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "EPSON Stylus C85"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "EPSON Stylus CX-3100"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "EPSON Stylus CX-8400"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
-msgstr "EPSON Stylus CX-3200"
+msgstr "EPSON Stylus CX-8400"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "EPSON Stylus CX-8400"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "EPSON Stylus CX-8400"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "EPSON Stylus CX-8400"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "EPSON Stylus CX-8400"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "EPSON Stylus CX-5100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "EPSON Stylus CX-5200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "EPSON Stylus CX-5300"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "EPSON Stylus CX-5400"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "EPSON Stylus CX-8300"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
-msgstr "EPSON Stylus CX-3100"
+msgstr "EPSON Stylus CX-8400"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "EPSON Stylus CX-6300"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "EPSON Stylus CX-6400"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "EPSON Stylus CX-8300"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "EPSON Stylus CX-6600"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
-msgstr "EPSON Stylus CX-8300"
+msgstr "EPSON Stylus CX-8400"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "EPSON Stylus CX-8300"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "EPSON Stylus CX-8400"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "EPSON Stylus CX-3100"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "EPSON Stylus CX-3100"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "EPSON Stylus CX-3200"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "EPSON Stylus C50"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "EPSON Stylus CX-8400"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr "EPSON CL-700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr "EPSON CL-750"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr "EPSON CL-760"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "EPSON EM-900C"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr "EPSON EM-900C"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr "EPSON EM-930C"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr "EPSON MC-2000"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr "EPSON MC-5000"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr "EPSON MC-7000"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr "EPSON MC-9000"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr "EPSON MC-10000"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr "EPSON MJ-930C"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr "EPSON MJ-6000C"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr "EPSON PM-700C"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr "EPSON PM-730C"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr "EPSON PM-740C"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr "EPSON PM-750C"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr "EPSON PM-760C"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr "EPSON PM-780C"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr "EPSON PM-800C"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr "EPSON PM-870C"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr "EPSON PM-880C"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr "EPSON PM-930C"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr "EPSON PM-940C"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr "EPSON PM-950C"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr "EPSON PM-970C"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr "EPSON PM-980C"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "EPSON PM-9000C"
+
+#: src/main/xmli18n-tmp.h:379
 msgid "EPSON PM-D750"
 msgstr "EPSON PM-D750"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PM-G700"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 msgid "EPSON PM-G800"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "EPSON PX-V600"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 msgid "EPSON PX-V500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 msgid "EPSON PX-V600"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "EPSON PX-V500"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr "EPSON PX-7000"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Colour StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Colour StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Colour StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr "HP DesignJet 2500C"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr "HP DesignJet 3500C"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr "HP DeskJet 600/600C"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr "HP DeskJet 600 series"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr "HP DeskJet 690 series"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr "HP DeskJet 900 series"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr "HP DeskJet 2000 series"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr "HP DeskJet 2500 series"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr "HP LaserJet II series"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr "HP LaserJet IIP series"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr "HP LaserJet III series"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr "HP LaserJet 4 series"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr "HP LaserJet 5 series"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr "HP LaserJet 6 series"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr "Olympus P200"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr "Olympus P400"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr "Olympus P440"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 #, fuzzy
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
@@ -4218,30 +4298,30 @@ msgstr "Set Default"
 msgid "Restore Previous"
 msgstr "Restore Previous"
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Print v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "About"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4249,7 +4329,7 @@ msgstr ""
 "Print and\n"
 "Save Settings"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4257,15 +4337,15 @@ msgstr ""
 "Save\n"
 "Settings"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Print"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Preview"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4289,73 +4369,73 @@ msgstr ""
 "If you click another button while dragging the mouse, the image will return "
 "to its original position."
 
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 msgid "Paper Size"
 msgstr "Paper Size"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr "Show All Paper Sizes"
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Dimensions:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Width:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 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:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Height:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 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:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 msgid "Automatic Paper Size"
 msgstr "Automatic Paper Size"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 msgid "Image Position"
 msgstr "Image Position"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Landscape"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "Upside down"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Seascape"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4363,119 +4443,119 @@ msgstr ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "Orientation:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "Left:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 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:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Right:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Top:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 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:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Bottom:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Centre:"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Centre the image horizontally on the paper"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Both"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Centre the image on the paper"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Centre the image vertically on the paper"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Setup Printer"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 msgid "Printer Make:"
 msgstr "Printer Make:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 msgid "Select the make of your printer"
 msgstr "Select the make of your printer"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Printer Model:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Select your printer model"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "PPD File:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Enter the correct PPD filename for your printer"
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Browse"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Choose the correct PPD filename for your printer"
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -4483,48 +4563,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:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 msgid "Printer Queue:"
 msgstr "Printer Queue:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid "Enter the correct command to print to your printer. "
 msgstr "Enter the correct command to print to your printer. "
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr "Enter the file to print to. "
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "File to print to"
 msgstr "File to print to"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 msgid "Print To File"
 msgstr "Print To File"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Define New Printer"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Printer Name:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 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:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 msgid "About Gutenprint "
 msgstr "About Gutenprint "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 msgid "Gutenprint Version "
 msgstr "Gutenprint Version "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 msgid ""
 "\n"
 "\n"
@@ -4568,11 +4648,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:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Printer Settings"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4580,11 +4660,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:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Setup Printer..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4592,11 +4672,11 @@ msgstr ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "New Printer..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4604,23 +4684,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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 msgid "Image Size"
 msgstr "Image Size"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Scaling:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Set the scale (size) of the image"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4628,31 +4708,31 @@ msgstr ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Percent"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr "Scale the print to the size of the page"
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 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:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Set the width of the print"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Set the height of the print"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4660,65 +4740,65 @@ msgstr ""
 "Use Original\n"
 "Image Size"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 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:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "Print Colour Adjust"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Set Defaults"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Close"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Image preview"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr "View Output Channels:"
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 msgid "Output"
 msgstr "Output"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Output Type:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "Select the desired output type"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Adjust Output..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Adjust colour balance, brightness, contrast, saturation, and dither algorithm"
 
-#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 msgid "Size Units:"
 msgstr "Size Units:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Units:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "Select the base unit of measurement for printing"
 
@@ -4849,15 +4929,15 @@ msgstr "English-GB"
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr "No"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr "Yes"
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr "Fine Adjustment"
 
@@ -5121,18 +5201,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5141,7 +5222,8 @@ msgstr ""
 "\n"
 "Cannot write to %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5159,83 +5241,83 @@ msgstr ""
 "Cannot detect printer type.\n"
 "Please use -m to specify your printer model.\n"
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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: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:976 src/escputil/escputil.c:1071
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Ink colour"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Percent remaining"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, 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:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 #, fuzzy
 msgid "Date"
 msgstr "Draft"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Printer identification requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "You may only specify one printer model."
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Cleaning heads...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5308,7 +5390,7 @@ msgstr ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5375,12 +5457,12 @@ msgstr ""
 "this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5399,20 +5481,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:1420 src/escputil/escputil.c:1427
-#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, 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:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5421,7 +5503,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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5430,12 +5512,12 @@ msgstr ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repeating the alignment process.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5450,17 +5532,17 @@ msgstr ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "About to save settings..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "failed!\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5469,27 +5551,27 @@ msgstr ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "succeeded!\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Unrecognised command.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Final command was not confirmed.\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5506,12 +5588,12 @@ msgstr ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Press enter to continue > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5522,42 +5604,42 @@ msgstr ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "Pass #%d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Please insert a fresh sheet of paper.\n"
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Number out of range!\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "I cannot understand what you typed!\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, 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:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Attempting to set alignment..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "succeeded.\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5570,7 +5652,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:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "Error in input\n"
@@ -5706,6 +5788,10 @@ msgstr "Bad parameters; cannot continue!\n"
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Get next row failed at %.0f\n"
 
+#, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Cannot parse output from printer\n"
+
 #~ msgid "Red Balance"
 #~ msgstr "Red Balance"
 
diff --git a/po/es.gmo b/po/es.gmo
index d852f17..3f65635 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index bb35986..582c99b 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -16,6 +16,7 @@ msgstr ""
 "X-Generator: KBabel 1.0beta1\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "Establecer por Omisión"
@@ -294,9 +295,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400x600 PPP"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Papel Común"
 
@@ -306,9 +307,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Papel Común"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Transparencias"
 
@@ -349,9 +350,10 @@ msgid "Photo Paper Pro"
 msgstr "Papel de Fotografía Profesional"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Otro"
 
@@ -415,7 +417,7 @@ msgstr "Origen del medio (ranura de entrada) al que está imprimiendo"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Resolución"
 
@@ -556,9 +558,9 @@ msgstr "Cian Claro"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -576,8 +578,8 @@ msgid "Light Yellow Transition"
 msgstr "Cian Claro"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -607,12 +609,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Negro"
 
@@ -632,14 +636,14 @@ msgstr "Color CcMmY para Fotografía"
 msgid "Photo CcMmYK Color"
 msgstr "Color CcMmYK para Fotografía"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Color"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -680,8 +684,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimir"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Tonos de gris"
@@ -843,12 +847,14 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Cian"
 
@@ -857,12 +863,14 @@ msgstr "Cian"
 msgid "Adjust the cyan gamma"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -871,12 +879,14 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Amarillo"
 
@@ -885,9 +895,10 @@ msgstr "Amarillo"
 msgid "Adjust the yellow gamma"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -896,8 +907,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -906,9 +917,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1148,7 +1160,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1239,135 +1251,146 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Estándar"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "Alimentación por Rollo"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manual"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autoseleccionar"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Altura:"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografía"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Cian Claro"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Negro"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarillo"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papel Opaco"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel para Fotografía"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Película Brillante"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Negro"
@@ -1614,87 +1637,79 @@ msgstr "Cian Claro"
 msgid "Medium Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 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:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamaño"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1748,104 +1763,105 @@ 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: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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 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: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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 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: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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Fotografía Compuesta de Cinco Colores"
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Película Brillante"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Sobres"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Papel Opaco"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Papel para Chorro de Tinta"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 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: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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Papel para Fotografía"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 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: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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografía Premium Luster"
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel Brillante de Calidad Fotográfica"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado Ilford"
 
@@ -1853,8 +1869,8 @@ msgstr "Papel Pesado Ilford"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1995,8 +2011,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "Archivo PPD:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "¿Archivo PPD?"
@@ -2005,184 +2021,184 @@ msgstr "¿Archivo PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Tonos de gris"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Cuatro Colores Estándard"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tres Colores Compuestos"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tres Colores Compuestos"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Papel Común Carga Rápida"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postal"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr "Back Light Film"
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "Papel Opaco"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papel Común"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papel Opaco"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2240,88 +2256,99 @@ msgstr "1200 PPP alta calidad"
 msgid "720 DPI Highest Quality"
 msgstr "1200 PPP altísima calidad"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 x 720 PPP"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 PPP"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brillo:"
@@ -3742,645 +3769,698 @@ msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4478,52 +4558,52 @@ msgstr "Establecer por Omisión"
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "Aceptar"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Imprimir v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "Acerca de"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 #, fuzzy
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 #, fuzzy
 msgid ""
 "Save\n"
 "Settings"
 msgstr "Guardar Conf."
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 #, fuzzy
 msgid ""
 "Position the image on the page.\n"
@@ -4549,76 +4629,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:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Dimensiones:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Ancho:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr "Ancho del papel al que desea imprimir"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Altura:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
 msgstr "Altura del papel al que desea imprimir"
 
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "Posición"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Automático"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Apaisado"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "Invertido"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Horizontal invertido"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4626,126 +4706,126 @@ msgstr ""
 "Seleccionar la orientación: vertical, horizontal, invertido,  ú horizontal "
 "invertido "
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "Orientación:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "Izquierda:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 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:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Derecha:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Arriba:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 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:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Abajo:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Centrado: "
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Centrar la imagen horizontalmente en el papel"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Ambos"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Centrar la imagen en el papel"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Centrar la imagen verticalmente en el papel"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Seleccionar su madelo de impresora"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Modelo de Impresora:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Seleccionar su madelo de impresora"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "Archivo PPD:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Ingrese el nombre de archivo PPD correcto para su impresora"
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Explorar"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Elija el nombre de archivo PPD correcto para su impresora"
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4754,54 +4834,54 @@ msgstr ""
 "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
 "que desea imprimir"
 
-#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, 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:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "prueba de impresión"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 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:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Acerca de Gimp-Print..."
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Versión de Gimp-Print "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid ""
 "\n"
@@ -4846,11 +4926,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:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4858,11 +4938,11 @@ msgstr ""
 "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
 "que desea imprimir"
 
-#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Conf. Impresora..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4870,11 +4950,11 @@ msgstr ""
 "Elegir el modelo de impresora, archivo PPD, y comando que se usa para "
 "imprimir a ésta impresora"
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "Impresora Nueva..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4882,24 +4962,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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Escala:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Establecer la escala (el tamaño) de la imagen"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr "Escalar por:"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4907,31 +4987,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:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Porcentaje"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 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:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPP"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 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:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Establecer el ancho de la impresión"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Establecer el alto de la impresión"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4939,69 +5019,69 @@ msgstr ""
 "Usar Medida Orig.\n"
 "de la Imagen"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 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:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "Ajuste de Impresión en Color"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Establecer por Omisión"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Vista previa de imagen"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "Tipo de salida:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Tipo de salida:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "Seleccionar el tipo de salida deseado"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Ajustar Salida..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 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:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "Seleccionar la unidad base de medida para imprimir"
 
@@ -5142,15 +5222,15 @@ msgstr "Spanish"
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5432,18 +5512,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5452,7 +5533,8 @@ msgstr ""
 "\n"
 "No puedo escribir a %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5470,87 +5552,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:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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: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:976 src/escputil/escputil.c:1071
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Color de tinta"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Porcentaje restante"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, 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:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, 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:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Usted sólo puede especificar un modelo de impresora"
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Limpiando inyectores...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5629,7 +5711,7 @@ msgstr ""
 "durante éste proceso.\n"
 "\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5701,12 +5783,12 @@ msgstr ""
 "durante éste proceso.\n"
 "\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5725,13 +5807,13 @@ msgstr ""
 "Luego le será requerido confirmar su elección.\n"
 "¿Qué opción elige? (s), (q), (r).\n"
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5739,7 +5821,7 @@ msgstr ""
 "Favor de confirmar tipeando 'q' de nuevo que usted quiere salir sin "
 "guardar:\n"
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5748,7 +5830,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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5757,12 +5839,12 @@ msgstr ""
 "Favor de confirmar tipeando 'r' de nuevo que usted quiere repetir el\n"
 "proceso de alineado:\n"
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repitiendo el proceso de alineación.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5777,17 +5859,17 @@ msgstr ""
 "Favor de confirmar que desea guardar la configuración de su impresora\n"
 "tipeando 's' de nuevo.\n"
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "Acerca de guardar configuración..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "¡falló!\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5796,27 +5878,27 @@ msgstr ""
 "Su configuración no fue guardada exitosamente. Debe repetir el\n"
 "proceso de alineación.\n"
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "¡éxito!\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Comando no reconocido.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "El comando final no fue confirmado.\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5833,12 +5915,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:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Presione enter para continuar > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5849,42 +5931,42 @@ msgstr ""
 "patrón.\n"
 "Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n"
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "Pasar #%d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, 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:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "¡Número fuera de rango!\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "¡No puedo entender lo que usted ha tipeado!\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, 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:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Intentando definir alineación..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "éxito.\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5897,7 +5979,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:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "Error en entrada\n"
@@ -6034,6 +6116,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Traer próxima fila falló en %d\n"
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "No puedo analizar salida de la impresora\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "Ajusta el balance amarillo de la impresión"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 53fdd36..bf6dc07 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 6735cdf..eca894d 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -17,6 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "Valeurs par défaut"
@@ -294,9 +295,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400 x 600 ppp"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Papier normal"
 
@@ -306,9 +307,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Papier normal"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Transparents"
 
@@ -349,9 +350,10 @@ msgid "Photo Paper Pro"
 msgstr "Papier photo pro"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Autre"
 
@@ -415,7 +417,7 @@ msgstr "Source (bac) du support vers lequel vous imprimez"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Résolution"
 
@@ -556,9 +558,9 @@ msgstr "Cyan clair"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -576,8 +578,8 @@ msgid "Light Yellow Transition"
 msgstr "Cyan clair"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -607,12 +609,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Noir"
 
@@ -632,14 +636,14 @@ msgstr "Photo couleur CcMmJ"
 msgid "Photo CcMmYK Color"
 msgstr "Photo couleur CcMmJN"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Couleur"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -680,8 +684,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimer"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Niveaux de gris"
@@ -843,12 +847,14 @@ msgstr "Gamma :"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -857,12 +863,14 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -871,12 +879,14 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Ajuste le niveau de majenta de l'impression"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Jaune"
 
@@ -885,9 +895,10 @@ msgstr "Jaune"
 msgid "Adjust the yellow gamma"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -896,8 +907,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -906,9 +917,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Ajuste le niveau de majenta de l'impression"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1148,7 +1160,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1239,135 +1251,146 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "Alimentation rouleau"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuel"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "Imprimer dans un fichier ?"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Sélection auto"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Hauteur :"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Photographie"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Six couleurs photo"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Cyan clair"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta clair"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Noir"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Jaune"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papier Mat"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papier photo"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Film glacé"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Noir"
@@ -1614,87 +1637,79 @@ msgstr "Cyan clair"
 msgid "Medium Gray Transition"
 msgstr "Cyan clair"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Type de sortie :"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Imprimer dans un fichier ?"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 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:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "Taille"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 ppp Unirectionnel"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 ppp Unirectionnel"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1748,104 +1763,105 @@ msgid "test print"
 msgstr "test d'impression"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 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: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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 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: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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Cinq couleurs photo composite"
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Film glacé"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Enveloppes"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Papier Mat"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Papier jet d'encre"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier jet d'encre qualité photo"
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Papier photo"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Papier glacé photo Premium"
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Papier photo Premium Luster"
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Papier glacé qualité photo"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr "Papier épais Ilford"
 
@@ -1853,8 +1869,8 @@ msgstr "Papier épais Ilford"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1994,8 +2010,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "Fichier PPD :"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "Fichier PPD ?"
@@ -2004,181 +2020,181 @@ msgstr "Fichier PPD ?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 msgid "Two Level Grayscale"
 msgstr "Niveaux de gris deux niveaux"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr "Quadichromie"
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr "Six couleurs amélioré composite"
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 msgid "Seven Color Photo"
 msgstr "Photo sept couleurs"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr "Sept couleurs amélioré"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Six couleurs photo"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Photo sept couleurs"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sept couleurs amélioré"
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Quatre couleurs standard"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Trois couleurs composite"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Trois couleurs composite"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Quatre couleurs standard"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Quatre couleurs standard"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Photo sept couleurs"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Six couleurs photo"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six couleurs amélioré composite"
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Photo sept couleurs"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sept couleurs amélioré"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Six couleurs photo"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Papier normal chargement rapide"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Carte postale"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr "Film back light"
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "Papier Mat"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papier glacé photo Premium"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papier normal"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papier Mat"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2236,88 +2252,99 @@ msgstr "1200 ppp Haute qualité"
 msgid "720 DPI Highest Quality"
 msgstr "1200 ppp Très haute qualité"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 x 720 ppp"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 ppp Trés haute qualité"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 ppp Trés haute qualité"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 ppp"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Nom de l'imprimante :"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nom de l'imprimante :"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Luminosité :"
@@ -3719,645 +3746,698 @@ msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4455,30 +4535,30 @@ msgstr "Valeurs par défaut"
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "Valider"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Print v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "À propos"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4486,7 +4566,7 @@ msgstr ""
 "Imprimer et enregistrer\n"
 "les réglages"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4494,15 +4574,15 @@ msgstr ""
 "Enregistrer\n"
 "les réglages"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Imprimer"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Aperçu"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4527,76 +4607,76 @@ msgstr ""
 "Si vous cliquez un autre bouton tandis que vous bougez la souris, l'image "
 "retournera à sa position originale."
 
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "Taille"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Dimensions :"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Largeur :"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr "Largeur du papier sur lequel vous souhaitez imprimer"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Hauteur :"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
 msgstr "Hauteur du papier sur lequel vous souhaitez imprimer"
 
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Taille"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "Position"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Paysage"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "Retourner"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Panoramique"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4604,125 +4684,125 @@ msgstr ""
 "Sélectionnez l'orientation : portrait, paysage, tête-bèche, ou tête-bèche "
 "paysage"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "Orientation :"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "Gauche :"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 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:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Droite :"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Dessus :"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 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:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Bas :"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Centrer :"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontalement"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Centrer l'image horizontalement sur le papier"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Les deux"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Centrer l'image sur le papier"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "Verticalement"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Centrer l'image verticalement sur le papier"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Configuration de l'imprimante"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Nom de l'imprimante :"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Sélectionnez le modèle de votre imprimante"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Modèle d'imprimante :"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Sélectionnez le modèle de votre imprimante"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "Fichier PPD :"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Entrez le nom de fichier PPD correct pour votre imprimante"
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Parcourir"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Choisissez le fichier PPD correct pour votre imprimante"
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4731,54 +4811,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:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Nom de l'imprimante :"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, 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:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "test d'impression"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "Imprimer dans un fichier ?"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Définir une nouvelle imprimante"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Nom de l'imprimante :"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 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:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "À propos de Gimp-Print"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Version de Gimp-Print"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid ""
 "\n"
@@ -4827,11 +4907,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:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Paramètres de l'imprimante"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4839,11 +4919,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:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Configurer l'imprimante..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4851,11 +4931,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:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "Nouvelle imprimante..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4863,24 +4943,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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "Taille"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Échelle :"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Régler l'échelle (taille) de l'image"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4888,31 +4968,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:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Pourcentage"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 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:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "points par pouce"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 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:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Défini la largeur de l'impression"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Défini la hauteur de l'impression"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4920,69 +5000,69 @@ msgstr ""
 "Utiliser la taille \n"
 "de l'image originale"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 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:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "Ajustez les couleurs d'impression"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Valeurs par défaut"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Aperçu de l'image"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "Type de sortie :"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Type de sortie :"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "Sélectionnez le type de sortie désiré"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Ajuster la sortie..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 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:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "Unités :"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Unités :"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "Sélectionne l'unité de base de mesure pour l'impression"
 
@@ -5123,15 +5203,15 @@ msgstr "French"
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5418,18 +5498,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5438,7 +5519,8 @@ msgstr ""
 "\n"
 "Impossible d'écrire sur %s : %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5456,88 +5538,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:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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: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:976 src/escputil/escputil.c:1071
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Encre couleur"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Pourcentage restant"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, 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:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, 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:1289
+#: src/escputil/escputil.c:1389
 #, 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:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Nettoyage des têtes...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5622,7 +5704,7 @@ msgstr ""
 "durant cette opération.\n"
 "\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5698,12 +5780,12 @@ msgstr ""
 "durant cette opération.\n"
 "\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5723,13 +5805,13 @@ msgstr ""
 "Il vous sera ensuite demandé de confirmer votre choix\n"
 "Que voulez-vous faire (s, q, r) ?\n"
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5737,7 +5819,7 @@ msgstr ""
 "Veuillez presser la touche « q » si vous souhaitez vraiment quitter sans "
 "enregistrer :\n"
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5747,7 +5829,7 @@ msgstr ""
 "Si vous souhaitez enregistrer l'alignement, vous devez répéter cette "
 "opération.\n"
 
-#: src/escputil/escputil.c:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5756,12 +5838,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:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Répétition de l'opération d'alignement.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5776,17 +5858,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:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "À propos de l'enregistrement des réglages..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "Échec !\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5795,27 +5877,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:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "Succès !\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Commande non reconnue.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, 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:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5832,12 +5914,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:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Pressez Entrée pour continuer > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5848,42 +5930,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:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "Passe #%d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, 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:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Nombre hors-intervalle !\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, 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:1593
+#: src/escputil/escputil.c:1693
 #, 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:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentative de réglage de l'alignement..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "Succès.\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5896,7 +5978,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:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "Erreur en entrée\n"
@@ -6033,6 +6115,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Obtenir la ligne suivante à échoué à %.0f\n"
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Impossible d'interpréter le message envoyé par l'imprimante\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "Ajuste le niveau de jaune de l'impression"
 
diff --git a/po/gutenprint.pot b/po/gutenprint.pot
index 949cb2f..24ac3fd 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -17,6 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 msgid "Default"
 msgstr ""
 
@@ -251,9 +252,9 @@ msgid "2400x2400 DPI DMT"
 msgstr ""
 
 #: 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
+#: 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 "Plain Paper"
 msgstr ""
 
@@ -262,9 +263,9 @@ msgid "Plain Paper PIXMA"
 msgstr ""
 
 #: 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
+#: 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 "Transparencies"
 msgstr ""
 
@@ -305,9 +306,10 @@ msgid "Photo Paper Pro"
 msgstr ""
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr ""
 
@@ -367,7 +369,7 @@ msgstr ""
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr ""
 
@@ -497,9 +499,9 @@ msgstr ""
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -515,8 +517,8 @@ msgid "Light Yellow Transition"
 msgstr ""
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -545,12 +547,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr ""
 
@@ -570,14 +574,14 @@ msgstr ""
 msgid "Photo CcMmYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr ""
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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"
@@ -615,8 +619,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr ""
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr ""
@@ -759,12 +763,14 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr ""
 
@@ -772,12 +778,14 @@ msgstr ""
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr ""
 
@@ -785,12 +793,14 @@ msgstr ""
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr ""
 
@@ -798,9 +808,10 @@ msgstr ""
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -808,8 +819,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -817,9 +828,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1027,7 +1039,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1115,121 +1127,132 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr ""
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 msgid "Manual Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 msgid "Print to CD"
 msgstr ""
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 msgid "High"
 msgstr ""
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 msgid "Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 msgid "Light Cyan"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 msgid "Light Magenta"
 msgstr ""
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 msgid "Light Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 msgid "Dark Yellow"
 msgstr ""
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 msgid "Matte Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 msgid "Photo Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 msgid "Light Light Black"
 msgstr ""
 
@@ -1449,81 +1472,73 @@ msgstr ""
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 msgid "Automatic"
 msgstr ""
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1577,104 +1592,105 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr ""
 
@@ -1682,8 +1698,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1815,8 +1831,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr ""
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 msgid "PPD File"
 msgstr ""
 
@@ -1824,161 +1840,161 @@ msgstr ""
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr ""
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 msgid "Two Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr ""
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr ""
 
-#: 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
+#: 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 "Back Light Film"
 msgstr ""
 
-#: 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: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 "Matte Paper Heavyweight"
+msgstr ""
+
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 msgid "ColorLife Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2027,76 +2043,85 @@ msgstr ""
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+msgid "720 x 720 DPI"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 msgid "1440 x 720 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Transposed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 msgid "2880 x 720 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 msgid "1440 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 msgid "2880 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 msgid "2880 x 1440 DPI Transposed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+msgid "5760 x 1440 DPI"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 msgid "2880 x 2880 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 msgid "5760 x 2880 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 msgid "Interleave"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 msgid "Interleave 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 msgid "Eight Pass"
 msgstr ""
 
@@ -3349,610 +3374,654 @@ msgid "EPSON Stylus CX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:304
-msgid "EPSON Stylus CX3810"
+msgid "EPSON Stylus CX3805"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:305
-msgid "EPSON Stylus CX4200"
+msgid "EPSON Stylus CX3810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:306
-msgid "EPSON Stylus CX4600"
+msgid "EPSON Stylus CX4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:307
-msgid "EPSON Stylus CX4700"
+msgid "EPSON Stylus CX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:308
-msgid "EPSON Stylus CX4800"
+msgid "EPSON Stylus CX4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:309
-msgid "EPSON Stylus CX5100"
+msgid "EPSON Stylus CX4600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:310
-msgid "EPSON Stylus CX5200"
+msgid "EPSON Stylus CX4700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:311
-msgid "EPSON Stylus CX5300"
+msgid "EPSON Stylus CX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:312
-msgid "EPSON Stylus CX5400"
+msgid "EPSON Stylus CX5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:313
-msgid "EPSON Stylus CX5800"
+msgid "EPSON Stylus CX5200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:314
-msgid "EPSON Stylus CX6300"
+msgid "EPSON Stylus CX5300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:315
-msgid "EPSON Stylus CX6400"
+msgid "EPSON Stylus CX5400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:316
-msgid "EPSON Stylus CX6500"
+msgid "EPSON Stylus CX5700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:317
-msgid "EPSON Stylus CX6600"
+msgid "EPSON Stylus CX5800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:318
-msgid "EPSON Stylus CX7700"
+msgid "EPSON Stylus CX6300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:319
-msgid "EPSON Stylus CX7800"
+msgid "EPSON Stylus CX6400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:320
-msgid "EPSON Stylus CX8300"
+msgid "EPSON Stylus CX6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:321
-msgid "EPSON Stylus CX8400"
+msgid "EPSON Stylus CX6600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:322
-msgid "EPSON Stylus D68"
+msgid "EPSON Stylus CX7700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:323
-msgid "EPSON Stylus D88"
+msgid "EPSON Stylus CX7800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:324
-msgid "EPSON Stylus DX3800"
+msgid "EPSON Stylus CX8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:325
-msgid "EPSON Stylus DX3850"
+msgid "EPSON Stylus CX8400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:326
-msgid "EPSON Stylus DX4200"
+msgid "EPSON Stylus D68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:327
-msgid "EPSON Stylus DX4800"
+msgid "EPSON Stylus D88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:328
-msgid "EPSON CL-700"
+msgid "EPSON Stylus DX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:329
-msgid "EPSON CL-750"
+msgid "EPSON Stylus DX3850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:330
-msgid "EPSON CL-760"
+msgid "EPSON Stylus DX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:331
-msgid "EPSON EM-900C"
+msgid "EPSON Stylus DX4250"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:332
-msgid "EPSON EM-930C"
+msgid "EPSON Stylus DX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON MC-2000"
+msgid "EPSON PictureMate"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON MC-5000"
+msgid "EPSON PictureMate Deluxe"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON MC-7000"
+msgid "EPSON CL-700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON MC-9000"
+msgid "EPSON CL-750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON MC-10000"
+msgid "EPSON CL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:338
-msgid "EPSON MJ-930C"
+msgid "EPSON E-100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON MJ-5100C"
+msgid "EPSON EM-900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON MJ-6000C"
+msgid "EPSON EM-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON MJ-8000C"
+msgid "EPSON MC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON PM-700C"
+msgid "EPSON MC-5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON PM-730C"
+msgid "EPSON MC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON PM-740C"
+msgid "EPSON MC-9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON PM-750C"
+msgid "EPSON MC-10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON PM-760C"
+msgid "EPSON MJ-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON PM-770C"
+msgid "EPSON MJ-5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON PM-780C"
+msgid "EPSON MJ-6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON PM-790PT"
+msgid "EPSON MJ-8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PM-800C"
+msgid "EPSON PM-700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PM-850PT"
+msgid "EPSON PM-730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PM-870C"
+msgid "EPSON PM-740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PM-880C"
+msgid "EPSON PM-750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "EPSON PM-930C"
+msgid "EPSON PM-760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "EPSON PM-940C"
+msgid "EPSON PM-770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "EPSON PM-950C"
+msgid "EPSON PM-780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "EPSON PM-970C"
+msgid "EPSON PM-790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "EPSON PM-980C"
+msgid "EPSON PM-800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "EPSON PM-2000C"
+msgid "EPSON PM-850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "EPSON PM-2200C"
+msgid "EPSON PM-870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "EPSON PM-3000C"
+msgid "EPSON PM-880C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "EPSON PM-3300C"
+msgid "EPSON PM-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "EPSON PM-3500C"
+msgid "EPSON PM-940C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "EPSON PM-3700C"
+msgid "EPSON PM-950C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "EPSON PM-4000PX"
+msgid "EPSON PM-970C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "EPSON PM-5000C"
+msgid "EPSON PM-980C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "EPSON PM-7000C"
+msgid "EPSON PM-2000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "EPSON PM-9000C"
+msgid "EPSON PM-2200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "EPSON PM-10000"
+msgid "EPSON PM-3000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "EPSON PM-D750"
+msgid "EPSON PM-3300C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "EPSON PM-D770"
+msgid "EPSON PM-3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "EPSON PM-D1000"
+msgid "EPSON PM-3700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "EPSON PM-G700"
+msgid "EPSON PM-4000PX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "EPSON PM-G720"
+msgid "EPSON PM-5000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "EPSON PM-G800"
+msgid "EPSON PM-7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "EPSON PM-G820"
+msgid "EPSON PM-9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "EPSON PX-G900"
+msgid "EPSON PM-10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-msgid "EPSON PX-G920"
+msgid "EPSON PM-A900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-msgid "EPSON PX-G5000"
+msgid "EPSON PM-D750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-msgid "EPSON PX-V500"
+msgid "EPSON PM-D770"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-msgid "EPSON PX-V600"
+msgid "EPSON PM-D1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-msgid "EPSON PX-7000"
+msgid "EPSON PM-G700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-msgid "EPSON PX-9000"
+msgid "EPSON PM-G720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-msgid "Apple Color StyleWriter 4100"
+msgid "EPSON PM-G800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-msgid "Apple Color StyleWriter 4500"
+msgid "EPSON PM-G820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-msgid "Apple Color StyleWriter 6500"
+msgid "EPSON PX-A650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-msgid "HP DeskJet 340"
+msgid "EPSON PX-G900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-msgid "HP DeskJet 400"
+msgid "EPSON PX-G920"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-msgid "HP DeskJet 500"
+msgid "EPSON PX-G5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-msgid "HP DesignJet 230"
+msgid "EPSON PX-V500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-msgid "HP DesignJet 250C"
+msgid "EPSON PX-V600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-msgid "HP DesignJet 700"
+msgid "EPSON PX-5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "HP DesignJet 750C"
+msgid "EPSON PX-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "HP DesignJet 2500C"
+msgid "EPSON PX-9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "HP DesignJet 3500C"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:396
-msgid "HP DesignJet 430"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "HP DesignJet 450C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP DesignJet 455CA"
+msgid "HP DeskJet 340"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP DesignJet 488CA"
+msgid "HP DeskJet 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP DeskJet 500C"
+msgid "HP DeskJet 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP DeskJet 520"
+msgid "HP DesignJet 230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP DeskJet 540C"
+msgid "HP DesignJet 250C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP DeskJet 550C"
+msgid "HP DesignJet 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP DeskJet 560C"
+msgid "HP DesignJet 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP DeskJet 600/600C"
+msgid "HP DesignJet 2500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP DeskJet 600 series"
+msgid "HP DesignJet 3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP DeskJet 690 series"
+msgid "HP DesignJet 430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:408
-msgid "HP DeskJet 810C"
+msgid "HP DesignJet 450C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "HP DeskJet 812C"
+msgid "HP DesignJet 455CA"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:410
-msgid "HP DeskJet 840C"
+msgid "HP DesignJet 488CA"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:411
-msgid "HP DeskJet 842C"
+msgid "HP DeskJet 500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:412
-msgid "HP DeskJet 845C"
+msgid "HP DeskJet 520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:413
-msgid "HP DeskJet 850C"
+msgid "HP DeskJet 540C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:414
-msgid "HP DeskJet 855C"
+msgid "HP DeskJet 550C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:415
-msgid "HP DeskJet 870C"
+msgid "HP DeskJet 560C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:416
-msgid "HP DeskJet 890C"
+msgid "HP DeskJet 600/600C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:417
-msgid "HP DeskJet 895C"
+msgid "HP DeskJet 600 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "HP DeskJet 900 series"
+msgid "HP DeskJet 690 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:419
-msgid "HP DeskJet 1100C"
+msgid "HP DeskJet 810C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "HP DeskJet 1120C"
+msgid "HP DeskJet 812C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "HP DeskJet 1200C"
+msgid "HP DeskJet 840C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "HP DeskJet 1220C"
+msgid "HP DeskJet 842C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "HP DeskJet 1600C"
+msgid "HP DeskJet 845C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
-msgid "HP DeskJet 2000 series"
+msgid "HP DeskJet 850C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:425
-msgid "HP DeskJet 2500 series"
+msgid "HP DeskJet 855C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:426
-msgid "HP PhotoSmart P1000"
+msgid "HP DeskJet 870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:427
-msgid "HP PhotoSmart P1100"
+msgid "HP DeskJet 890C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:428
-msgid "HP LaserJet II series"
+msgid "HP DeskJet 895C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:429
-msgid "HP LaserJet IIP series"
+msgid "HP DeskJet 900 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:430
-msgid "HP LaserJet III series"
+msgid "HP DeskJet 1100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:431
-msgid "HP LaserJet 4 series"
+msgid "HP DeskJet 1120C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:432
-msgid "HP LaserJet 4L"
+msgid "HP DeskJet 1200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:433
-msgid "HP LaserJet 4V"
+msgid "HP DeskJet 1220C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:434
-msgid "HP LaserJet 4Si"
+msgid "HP DeskJet 1600C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:435
-msgid "HP LaserJet 5 series"
+msgid "HP DeskJet 2000 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:436
-msgid "HP LaserJet 5Si"
+msgid "HP DeskJet 2500 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:437
-msgid "HP LaserJet 6 series"
+msgid "HP PhotoSmart P1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:438
-msgid "Lexmark 4076"
+msgid "HP PhotoSmart P1100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:439
-msgid "Lexmark Z42"
+msgid "HP LaserJet II series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:440
-msgid "Lexmark Z43"
+msgid "HP LaserJet IIP series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:441
-msgid "Lexmark Z52"
+msgid "HP LaserJet III series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:442
-msgid "Lexmark Z53"
+msgid "HP LaserJet 4 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:443
-msgid "Olympus P10"
+msgid "HP LaserJet 4L"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:444
-msgid "Olympus P200"
+msgid "HP LaserJet 4V"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:445
-msgid "Olympus P300"
+msgid "HP LaserJet 4Si"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:446
-msgid "Olympus P400"
+msgid "HP LaserJet 5 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:447
-msgid "Olympus P440"
+msgid "HP LaserJet 5Si"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:448
-msgid "Canon CP100"
+msgid "HP LaserJet 6 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:449
-msgid "Canon CP220"
+msgid "Lexmark 4076"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:450
-msgid "Sony UP-DP10"
+msgid "Lexmark Z42"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:451
-msgid "Sony UP-DR150"
+msgid "Lexmark Z43"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:452
-msgid "Fujifilm Printpix CX-400"
+msgid "Lexmark Z52"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:453
-msgid "Fujifilm Printpix CX-550"
+msgid "Lexmark Z53"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:454
-msgid "RAW DATA 16 bit"
+msgid "Olympus P10"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:455
+msgid "Olympus P200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:456
+msgid "Olympus P300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:457
+msgid "Olympus P400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:458
+msgid "Olympus P440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:459
+msgid "Canon CP100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:460
+msgid "Canon CP220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:461
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:462
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:463
+msgid "Fujifilm Printpix CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:464
+msgid "Fujifilm Printpix CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:465
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4042,50 +4111,50 @@ msgstr ""
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4099,238 +4168,238 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 msgid "Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 msgid "Image Position"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 msgid "Distance from the left of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the right of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the right of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the top of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 msgid "Distance from the bottom of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Horizontal"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Vertical"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 msgid "Printer Make:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 msgid "Select the make of your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 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:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 msgid "Printer Queue:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 msgid "Print To File"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 msgid "Enter the name you wish to give this logical printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 msgid "About Gutenprint "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 msgid "Gutenprint Version "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 msgid ""
 "\n"
 "\n"
@@ -4354,146 +4423,146 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 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:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 msgid "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 msgid "Set the print size to the size of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 msgid "Output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 msgid "Size Units:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr ""
 
@@ -4623,15 +4692,15 @@ msgstr ""
 msgid "ISOLatin1"
 msgstr ""
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -4805,25 +4874,27 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -4838,82 +4909,82 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr ""
-
-#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
-#, c-format
-msgid "Cannot identify printer!\n"
-msgstr ""
-
 #: src/escputil/escputil.c:927
 #, c-format
-msgid "Printer does not support listing ink types!\n"
+msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1289
+#: src/escputil/escputil.c:1389
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4952,7 +5023,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4988,12 +5059,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5005,38 +5076,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr ""
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1530
 #, 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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5046,44 +5117,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5094,12 +5165,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5107,42 +5178,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5151,7 +5222,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr ""
diff --git a/po/ja.gmo b/po/ja.gmo
index f9fffd7..8f4c23a 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 959215c..474c552 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -15,6 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "½é´üÃͤËÌ᤹"
@@ -292,9 +293,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Ä̾ï¤ÎÍÑ»æ"
 
@@ -304,9 +305,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Ä̾ï¤ÎÍÑ»æ"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "¥¹¥é¥¤¥ÉÍÑ»æ"
 
@@ -347,9 +348,10 @@ msgid "Photo Paper Pro"
 msgstr "¥Õ¥©¥ÈÍÑ»æ Pro"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "¤½¤Î¾"
 
@@ -413,7 +415,7 @@ msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "²òÁüÅÙ"
 
@@ -554,9 +556,9 @@ msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -574,8 +576,8 @@ msgid "Light Yellow Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -605,12 +607,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "¹õ¿§"
 
@@ -630,14 +634,14 @@ msgstr "¥Õ¥©¥È CcMmY ¿§"
 msgid "Photo CcMmYK Color"
 msgstr "¥Õ¥©¥È CcMmYK ¿§"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "¥«¥é¡¼"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -678,8 +682,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "°õºþ"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
@@ -840,12 +844,14 @@ msgstr "¥¬¥ó¥Þ:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "¥·¥¢¥ó (C)"
 
@@ -854,12 +860,14 @@ msgstr "¥·¥¢¥ó (C)"
 msgid "Adjust the cyan gamma"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
@@ -868,12 +876,14 @@ msgstr "¥Þ¥¼¥ó¥¿ (M)"
 msgid "Adjust the magenta gamma"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "²«¿§ (Y)"
 
@@ -882,9 +892,10 @@ msgstr "²«¿§ (Y)"
 msgid "Adjust the yellow gamma"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -893,8 +904,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -903,9 +914,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1144,7 +1156,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1235,135 +1247,146 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "ɸ½à"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "¥í¡¼¥ë¼°µë»æ"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "¼êÆ°"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "¼«Æ°ÁªÂò"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "¹â¤µ:"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "¼Ì¿¿"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Six Color Photo"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "¹õ¿§"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "¹õ¿§"
@@ -1610,87 +1633,79 @@ msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 msgid "Medium Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1744,104 +1759,105 @@ msgid "test print"
 msgstr "¥Æ¥¹¥È°õºþ"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 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: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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 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: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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Five Color Photo Composite"
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "ÉõÅû"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "¸÷ÂôÉÕ¤­ÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
@@ -1849,8 +1865,8 @@ msgstr "Ilford Heavy Paper"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1990,8 +2006,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD ¥Õ¥¡¥¤¥ë:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
@@ -2000,181 +2016,181 @@ msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 msgid "Two Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr "Six Color Enhanced Composite"
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 msgid "Seven Color Photo"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Four Color Standard"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Three Color Composite"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Three Color Composite"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Four Color Standard"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Four Color Standard"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six Color Enhanced Composite"
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Ä̾ïÍÑ»æ¤Î¹â®Æɹþ¤ß"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "¤Ï¤¬¤­"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr "¥Ð¥Ã¥¯¥é¥¤¥È¡¦¥Õ¥£¥ë¥à"
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "ColorLife Paper"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2232,88 +2248,99 @@ msgstr "1200 DPI ¹âÉʼÁ"
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "ÌÀ¤ë¤µ:"
@@ -3715,645 +3742,698 @@ msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4451,30 +4531,30 @@ msgstr "½é´üÃͤËÌ᤹"
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "¼è¤ê¾Ã¤·"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- °õºþ v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "¾ðÊó"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4482,7 +4562,7 @@ msgstr ""
 "°õºþ¤È\n"
 "ÀßÄê¤ÎÊݸ"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4490,15 +4570,15 @@ msgstr ""
 "ÀßÄê¤Î\n"
 "Êݸ"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "°õºþ"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "¥×¥ì¥Ó¥å¡¼"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4521,254 +4601,254 @@ msgstr ""
 "¤ò°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n"
 "¥É¥é¥Ã¥°Ãæ¤ËÊ̤Υܥ¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢²èÁü¤Ï¸µ¤Î¾ì½ê¤ËÌá¤ê¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "À£Ë¡:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Éý:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr "°õºþ¤¹¤ëÍÑ»æ¤ÎÉý¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "¹â¤µ:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
 msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¹â¤µ¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "°ÌÃÖ"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "¼«Æ°"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "½ÄÃÖ¤­"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "¾å²¼"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "²£Ä¹"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 "ÍÑ»æ¤ÎÊý¸þ¤òÁªÂò¤·¤Þ¤¹: ½ÄÃÖ¤­¡¢²£ÃÖ¤­¡¢¾å²¼¡¢¤Þ¤¿¤Ï²£Ä¹ (¾å²¼¤Ä¤­¤Î²£ÃÖ¤­)"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "ÍÑ»æ¤Î¸þ¤­:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "º¸Â¦:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 msgid "Distance from the left of the paper to the image"
 msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "±¦Â¦:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Î±¦Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the right of the paper to the image"
 msgstr "ÍÑ»æ¤Î±¦Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "¾å¦:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the top of the paper to the image"
 msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "²¼Â¦:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Î²¼Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 msgid "Distance from the bottom of the paper to the image"
 msgstr "ÍÑ»æ¤Î²¼Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Ãæ¿´:"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "¿åÊ¿"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "ÍÑ»æ¤Î¿åÊ¿Êý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "ξü"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "ÍÑ»æ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "¿âľ"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "ÍÑ»æ¤Î¿âľÊý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "PPD ¥Õ¥¡¥¤¥ë:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "»²¾È"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 #, 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:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "¥Æ¥¹¥È°õºþ"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 msgid "Enter the name you wish to give this logical printer"
 msgstr "ÍøÍѤ¹¤ëÏÀÍý¥×¥ê¥ó¥¿Ì¾¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Gimp-Print"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print ¥Ð¡¼¥¸¥ç¥ó "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid ""
 "\n"
@@ -4812,31 +4892,31 @@ msgstr ""
 "Free Software Foundation, Inc., 56 Temple Place - \n"
 "Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 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:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤È PPD ¥Õ¥¡¥¤¥ë¡¢°õºþ¥³¥Þ¥ó¥É¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4844,24 +4924,24 @@ msgstr ""
 "¿·µ¬¤ËÏÀÍý¥×¥ê¥ó¥¿¤òÄêµÁ¤·¤Þ¤¹¡£¤³¤ì¤Ï¼¡²ó»ÈÍѤ¹¤ë¤¿¤á¤Ë³Ð¤¨¤Æ¤ª¤­¤¿¤¤ÀßÄê̾"
 "¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "³ÈÂç½Ì¾®:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "²èÁü¥µ¥¤¥º¤Î³ÈÂç½Ì¾®¤ò¹Ô¤¤¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4869,31 +4949,31 @@ msgstr ""
 "³ÈÂç½Ì¾®¤Îñ°Ì¤È¤·¤Æ¡¢Íѻ極¥¤¥º¤ËÂФ¹¤ëɴʬΨ (ÈæΨ) ¤«¡¢¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤òÁª"
 "Âò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "ÈæΨ"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
 msgstr "²èÁü¤Î¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "°õºþ»þ¤ÎÉý¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4901,68 +4981,68 @@ msgstr ""
 "¥ª¥ê¥¸¥Ê¥ë¤Î\n"
 "¥µ¥¤¥º¤ÎÍøÍÑ"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 msgid "Set the print size to the size of the image"
 msgstr "²èÁü¤Î¥ª¥ê¥¸¥Ê¥ë¡¦¥µ¥¤¥º¤ò°õºþ¥µ¥¤¥º¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "°õºþ¥«¥é¡¼Ä´À°"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "½é´üÃͤËÌ᤹"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "ÊĤ¸¤ë"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "²èÁü¤Î¥×¥ì¥Ó¥å¡¼"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "½ÐÎϤ¹¤ë·ÁÂÖ¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "½ÐÎϤÎÄ´À°..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "¥«¥é¡¼¥Ð¥é¥ó¥¹¡¢ÌÀ¤ë¤µ¡¢¥³¥ó¥È¥é¥¹¥È¡¢ºÌÅ٤ȥǥ£¥¶¥ê¥ó¥°Êý¼°¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "ñ°Ì:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "ñ°Ì:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "°õºþ»þ¤Î´ðËÜñ°Ì¤òÁªÂò¤·¤Þ¤¹¡£"
 
@@ -5103,15 +5183,15 @@ msgstr "Japanese"
 msgid "ISOLatin1"
 msgstr "ISO ¥é¥Æ¥ó£±"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5383,18 +5463,19 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó; %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5403,7 +5484,8 @@ msgstr ""
 "\n"
 "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5421,84 +5503,84 @@ msgstr ""
 "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½Ð¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÆÃÄꤹ¤ë¤¿¤á¤Ë '-m' ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
-#, fuzzy, c-format
-msgid "Cannot identify printer!\n"
-msgstr "¥×¥ê¥ó¥¿¤«¤é¤Î½ÐÎϤò²òÀϤǤ­¤Þ¤»¤ó\n"
-
-#: src/escputil/escputil.c:927
-#, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
-
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "¥¤¥ó¥¯¤Î¿§"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "»Ä¤ê¤Î³ä¹ç"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, fuzzy, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+
+#: src/escputil/escputil.c:1144
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¼±Ê̻Ҥ¬É¬ÍפǤ¹¡£\n"
 
-#: src/escputil/escputil.c:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "¥Ø¥Ã¥É¤ÎÀ¶ÁÝÃæ...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "¥Î¥º¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥×¥ê¥ó¥¿¤ÎÃæ¤ËÍѻ椬³Î¼Â¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ"
 "²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5574,7 +5656,7 @@ msgstr ""
 "¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
 "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5640,12 +5722,12 @@ msgstr ""
 "¤µ¤¤¡£\n"
 "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5664,19 +5746,19 @@ msgstr ""
 "ÁªÂò¸å¤ËºÇ¸å¤Î³Îǧ¤¬¤¢¤ê¤Þ¤¹¡£\n"
 "ÁªÂò¤·¤Æ²¼¤µ¤¤ (s, q, r)¡£\n"
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr "ËÜÅö¤ËÀßÄê¤òÇË´þ¤·¤Æ½ªÎ»¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 'q' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5685,19 +5767,19 @@ msgstr ""
 "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ÊäÀµ¤µ¤ì¤Þ¤·¤¿¡£Ã¢¤·¤½¤Î´Ö³Ö¤Ï¤Þ¤ÀÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "¤½¤Î´Ö³Ö¤òÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1437
+#: src/escputil/escputil.c:1537
 #, 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:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5713,17 +5795,17 @@ msgstr ""
 "¤³¤ÎÀßÄê¤ò¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 's' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
 "\n"
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "ÀßÄê¤ÎÊݸ¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "¼ºÇԤǤ¹¡ª\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5732,27 +5814,27 @@ msgstr ""
 "¤¢¤Ê¤¿¤ÎÀßÄê¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 "ºÆÅÙ¡¢´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "´°Î»¤·¤Þ¤·¤¿¡ª\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄ꤬¥×¥ê¥ó¥¿¤ËÊݸ¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/escputil/escputil.c:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "ºÇ¸å¤Î¥³¥Þ¥ó¥É¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5769,12 +5851,12 @@ msgstr ""
 "°õºþ¥Ø¥Ã¥É´Ö³ÖÊäÀµ¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¥×¥ê¥ó¥¿¤Î¥È¥ì¥¤¤Ë\n"
 "ÍÑ»æ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "²¿¤«¥­¡¼¤òÆþÎϤ¹¤ë¤È³¹Ô¤·¤Þ¤¹ > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5785,42 +5867,42 @@ msgstr ""
 "¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ"
 "¤¹¡£\n"
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "¥Ñ¥¹ #%d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "¿·¤·¤¤ÍÑ»æ¤ò¥È¥ì¥¤¤ËÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "ÆþÎϤ·¤¿¤â¤Î¤Ï̵¸ú¤Ç¤¹¡ª\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "´Ö³ÖÊäÀµÃæ..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "´°Î»¤·¤Þ¤·¤¿¡£\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5833,7 +5915,7 @@ msgstr ""
 "¤â¤·ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇŬ¤Ê°õºþÉʼÁ¤òÆÀ¤ë¤¿¤á¤Ë\n"
 "ƱÍͤÎÁàºî¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "ÆþÎÏ¥¨¥é¡¼\n"
@@ -5970,6 +6052,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "¥×¥ê¥ó¥¿¤«¤é¤Î½ÐÎϤò²òÀϤǤ­¤Þ¤»¤ó\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
diff --git a/po/nb.gmo b/po/nb.gmo
index 5e8ce67..192e5c6 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 5ade1f1..151dc9b 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -15,6 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "Sett til standardverdier"
@@ -278,9 +279,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Vanlig papir"
 
@@ -290,9 +291,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Vanlig papir"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Gjennomsiktighet"
 
@@ -333,9 +334,10 @@ msgid "Photo Paper Pro"
 msgstr "Profesjonelt fotopapir"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Annet"
 
@@ -398,7 +400,7 @@ msgstr ""
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Oppløsning"
 
@@ -535,9 +537,9 @@ msgstr "Lys cyan"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -555,8 +557,8 @@ msgid "Light Yellow Transition"
 msgstr "Lys cyan"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -586,12 +588,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Sort"
 
@@ -611,14 +615,14 @@ msgstr "Foto CcMmY-farge"
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK-farge"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farger"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -659,8 +663,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Gråtoner"
@@ -817,12 +821,14 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -830,12 +836,14 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -843,12 +851,14 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Gul"
 
@@ -856,9 +866,10 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -866,8 +877,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -875,9 +886,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1109,7 +1121,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1200,135 +1212,146 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "Skriv ut til fil?"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autovelg"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Høyde:"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografi"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Sort"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gul"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matt papir"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapir"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glanset film"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Sort"
@@ -1566,85 +1589,77 @@ msgstr "Lys cyan"
 msgid "Medium Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut til fil?"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1698,104 +1713,105 @@ msgid "test print"
 msgstr "testutskrift"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Glanset film"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Konvolutter"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Matt papir"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Papir for blekkskriver"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papir med fotokvalitet for blekkskriver"
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr ""
 
@@ -1803,8 +1819,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1940,8 +1956,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD fil:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD/Fil?"
@@ -1950,184 +1966,184 @@ msgstr "PPD/Fil?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Gråtoner"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Farge"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Vanlig papir"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkort"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr ""
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "Matt papir"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Glanset fotopapir"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Vanlig papir"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matt papir"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2182,86 +2198,97 @@ msgstr ""
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "1200 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivernavn:"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivernavn:"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Lysstyrke:"
@@ -3665,645 +3692,698 @@ msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4401,30 +4481,30 @@ msgstr "Sett til standardverdier"
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Skriv ut v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4432,7 +4512,7 @@ msgstr ""
 "Skriv ut og\n"
 "lagre innstillinger"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4440,15 +4520,15 @@ msgstr ""
 "Lagre\n"
 "innstillinger"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4462,252 +4542,252 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Størrelse:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Bredde:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr "Bredde på papiret du skal skrive ut på"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Høyde:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 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:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "Posisjon"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Portrett"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Landskap"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "Opp-ned"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Landskap"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "Venstre:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 msgid "Distance from the left of the paper to the image"
 msgstr "Avstand fra venstre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Høyre:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Øverst:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the top of the paper to the image"
 msgstr "Avstand fra toppen av arket til bildet"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Nederst:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Avstand fra nedre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Sentrer:"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horisontalt"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Sentrer bildet horisontalt på arket"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Begge"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Sentrer bildet på arket"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertikalt"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Sentrer bildet vertikalt på arket"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Sett opp skriver"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Velg din skrivermodell"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Raskt heltall"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Velg din skrivermodell"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "PPD fil:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Bla gjennom"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Velg korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 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:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "testutskrift"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "Skriv ut til fil?"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Definer ny skriver"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 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:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Om Gimp-Print"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print versjon "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 msgid ""
 "\n"
 "\n"
@@ -4731,84 +4811,84 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Innstillinger for parametere"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 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:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Sett opp skriver..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "Ny skriver..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Skalering"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Sett skalering (størrelse) på bildet"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Prosent"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr "Skaler utskriften til størrelsen på papiret"
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skaler utskriften til antall punkter per tomme"
 
-#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Sett bredde på utskriften"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Sett høyde for utskriften"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4816,67 +4896,67 @@ msgstr ""
 "Bruk opprinnelig\n"
 "bildestørrelse"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 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:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Sett til standardverdier"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Lukk"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Forhåndsvisning av bilde"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "Utskriftstype:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Utskriftstype:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "Velg ønsket type for utdata"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Juster utskrift..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr ">"
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "Velg basis måleenhet for utskrift"
 
@@ -5017,15 +5097,15 @@ msgstr "Norwegian"
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5199,18 +5279,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5219,7 +5300,8 @@ msgstr ""
 "\n"
 "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5237,82 +5319,82 @@ msgstr ""
 "Kan ikke finne skrivertype.\n"
 "Vennligst bruk -m for å spesifisere din skrivermodell.\n"
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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:927
-#, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "Skriver støtter ikke fargeutskrift\n"
-
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Blekkfarge"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Prosent gjenstående"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, fuzzy, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr "Skriver støtter ikke fargeutskrift\n"
+
+#: src/escputil/escputil.c:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, 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:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Du kan kun oppgi én skrivermodell."
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Renser hoder...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5351,7 +5433,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5387,12 +5469,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5404,20 +5486,20 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr ">"
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, 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:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5426,7 +5508,7 @@ msgstr ""
 "OK, skriveren er justert, men justeringen er ikke lagret.\n"
 "Hvis du ønsker å lagre justeringen må d\n"
 
-#: src/escputil/escputil.c:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5435,12 +5517,12 @@ msgstr ""
 "Vennligst bekreft at du vil gjenta justeringsprosessen ved å\n"
 "skrive «r»:\n"
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Gjentar justeringsprosessen.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5450,44 +5532,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "I ferd med å lagre innstillinger..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "feilet!\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "fullført!\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Kommandoen ble ikke gjenkjent.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Siste kommando ble ikke bekreftet.\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5498,12 +5580,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Trykk linjeskift for å fortsette > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5511,42 +5593,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "Gjennomgang #%d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vennligst sett inn et nytt ark.\n"
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Tallet er utenfor gyldig område!\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Kan ikke forstå det du skrev inn!\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Prøver å sette justering..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "fullført.\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5555,7 +5637,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "Feil i inndata\n"
@@ -5692,6 +5774,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Henting av neste rad feilet ved %.0f\n"
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Kan ikke tolke utskrift fra skriver\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "Gul"
 
diff --git a/po/nl.gmo b/po/nl.gmo
index 2d586c7..1cbd16d 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 0f1f018..5e0faad 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -15,6 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 msgid "Default"
 msgstr ""
 
@@ -283,9 +284,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Blank papier"
 
@@ -295,9 +296,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Blank papier"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Transparanten"
 
@@ -338,9 +339,10 @@ msgid "Photo Paper Pro"
 msgstr "Professioneel fotopapier"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Overige"
 
@@ -403,7 +405,7 @@ msgstr ""
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Resolutie"
 
@@ -544,9 +546,9 @@ msgstr "Licht Cyaan"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -564,8 +566,8 @@ msgid "Light Yellow Transition"
 msgstr "Licht Cyaan"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -595,12 +597,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Zwart"
 
@@ -620,14 +624,14 @@ msgstr "Foto CcMmY kleuren"
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK Kleuren"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Kleur"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -668,8 +672,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Afdrukken"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Grijswaarden"
@@ -825,12 +829,14 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Cyaan"
 
@@ -839,12 +845,14 @@ msgstr "Cyaan"
 msgid "Adjust the cyan gamma"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -853,12 +861,14 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Geel"
 
@@ -867,9 +877,10 @@ msgstr "Geel"
 msgid "Adjust the yellow gamma"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -878,8 +889,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -888,9 +899,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1125,7 +1137,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1216,135 +1228,146 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standaard"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "Rolinvoer"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Handmatig"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "Afdrukken Naar Bestand"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisch Selecteren"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Hoogte: "
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Foto"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Zes kleuren foto"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Licht Cyaan"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Licht Magenta"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Zwart"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Geel"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Mat papier"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapier"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glanzende laag"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Zwart"
@@ -1590,86 +1613,78 @@ msgstr "Licht Cyaan"
 msgid "Medium Gray Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Afdrukken Naar Bestand"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Handmatig"
 
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "Grootte"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI unidirectioneel"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI unidirectioneel"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1723,104 +1738,105 @@ msgid "test print"
 msgstr "Test afdruk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 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: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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 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: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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Vijf kleuren foto composiet"
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Glanzende laag"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Enveloppen"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Mat papier"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Inkjet-papier"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokwaliteit Inkjet-papier"
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotopapier"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium glanzend fotopapier"
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster Photo Papier"
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokwaliteit glanzend papier"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
@@ -1828,8 +1844,8 @@ msgstr "Ilford Heavy Paper"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1969,8 +1985,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD Bestand:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD Bestand?"
@@ -1979,183 +1995,183 @@ msgstr "PPD Bestand?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Grijswaarden"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr "Zes kleuren verbeterd composiet"
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr "Zeven kleuren verbeterd"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Zeven kleuren verbeterd"
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Vier kleuren standaard"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Drie kleuren composiet"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Drie kleuren composiet"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Vier kleuren standaard"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Vier kleuren standaard"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Zes kleuren verbeterd composiet"
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Zeven kleuren verbeterd"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Blak papier snellader"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Briefkaart"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr ""
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "Mat papier"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium glanzend fotopapier"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Blank papier"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Mat papier"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2213,88 +2229,99 @@ msgstr "1200 DPI hoge kwaliteit"
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI Hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Printer Naam:"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Printer Naam:"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Helderheid:"
@@ -3697,645 +3724,698 @@ msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4429,30 +4509,30 @@ msgstr ""
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "Info"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4460,7 +4540,7 @@ msgstr ""
 "Afdrukken en\n"
 "instellingen opslaan"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4468,15 +4548,15 @@ msgstr ""
 "Instellingen\n"
 "opslaan"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4490,201 +4570,201 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "Grootte"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Afmetingen"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Breedte: "
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 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:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Hoogte: "
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 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:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Grootte"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "Positie"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Portret"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Landschap"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "Ondersteboven"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 #, fuzzy
 msgid "Orientation:"
 msgstr "Gekleurdheid:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "Links:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 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:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Rechts:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Boven:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 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:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Onder:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Midden X:"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horzintaal"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Centreer het plaatje horizontaal op het papier"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Beide"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Centreer het plaatje op het papier"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Centreer het plaatje verticaal op het papier"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Stel Printer in"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Printer Naam:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Selecteer jouw printer model"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Printer model:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Selecteer jouw printer model"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "PPD Bestand:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Geef de juiste PPD bestandsnaam voor jouw printer"
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Bladeren"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Kies de juiste PPD bestandsnaam voor jouw printer"
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4693,54 +4773,54 @@ msgstr ""
 "Selecteer de naam van de printer (Niet het type, of model, of printer) "
 "waarna je wenst te printen"
 
-#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Printer Naam:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Geef de juiste PPD bestandsnaam voor jouw printer"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "Test afdruk"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "Afdrukken Naar Bestand"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Stel nieuwe Printer in"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Printer Naam:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 msgid "Enter the name you wish to give this logical printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Info over Gimp-Print"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print Versie"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid ""
 "\n"
@@ -4785,11 +4865,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:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Printerinstellingen"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4797,11 +4877,11 @@ msgstr ""
 "Selecteer de naam van de printer (Niet het type, of model, of printer) "
 "waarna je wenst te printen"
 
-#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Instellen Printer..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4809,129 +4889,129 @@ msgstr ""
 "Kies het printermodel, PPD bestand, en commando die gebruikt wordt om naar "
 "deze printer af te drukken."
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "Nieuwe Printer..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "Grootte"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Schaldn"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Geef de schaal (formaat) van het plaatje"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Geef de breedte van de afdruk"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Geef de hoogte van de afdruk"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 msgid "Set the print size to the size of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Afdruk voorvertoning"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 msgid "Output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Past uitvoer aan..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "Eenheden"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr ">"
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Eenheden"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr ""
 
@@ -5071,15 +5151,15 @@ msgstr "Dutch"
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5274,18 +5354,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5294,7 +5375,8 @@ msgstr ""
 "\n"
 "Kan niet schrijven naar %s:%s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5312,84 +5394,84 @@ msgstr ""
 "Kan printer type niet vaststellen.\n"
 "Gebruik asjeblief -m om je printermodel te specificeren.\n"
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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:927
-#, fuzzy, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr "Printer ondersteund geen kleuren\n"
-
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Kleureninkt"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Overblijvend percentage"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, fuzzy, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr "Printer ondersteund geen kleuren\n"
+
+#: src/escputil/escputil.c:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "U mag maar een printermodel specificeren"
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Bezig met het schoonmaken van de koppen..\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5467,7 +5549,7 @@ msgstr ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5545,12 +5627,12 @@ msgstr ""
 "tijdens deze procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5562,19 +5644,19 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr ">"
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5583,19 +5665,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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Herhaal de uitlijn procedure.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5605,17 +5687,17 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "Bezig met schrijven van instellingen..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "Gefaalt!\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5624,27 +5706,27 @@ msgstr ""
 "Je instellingen werden niet succesvol weggeschreven. Je moet de\n"
 "uitlijn procedure herhalen.\n"
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "Gelukt!\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Onbekend commando.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Laatste commando is niet bevestigd.\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5655,12 +5737,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Druk enter om door te gaan >"
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5671,42 +5753,42 @@ msgstr ""
 "patroon.\n"
 "Tik een paar-nummer, '?' voor hulp, or 'r' om de procedure te herhalen.\n"
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Voer astublief een nieuw vel papier in.\n"
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Nummer valt buiten bereik!\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Ik begrijp wat je zonet ingetikt hebt niet!\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, 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:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Probeert uitlijning in te stellen."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "gelukt.\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5719,7 +5801,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:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr ""
@@ -5856,6 +5938,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Zoek volgende rij faalde op %d\n"
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Kan de uitvoer van de printer niet verwerken\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "Pas de hoeveelheid geel aan"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index 8f59c1e..71db317 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 6796d76..e7797db 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -19,6 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "Ustaw domy¶lne"
@@ -285,9 +286,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Zwyk³y papier"
 
@@ -297,9 +298,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Zwyk³y papier"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Przezroczyste"
 
@@ -340,9 +341,10 @@ msgid "Photo Paper Pro"
 msgstr ""
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Inne"
 
@@ -404,7 +406,7 @@ msgstr ""
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Rozdzielczo¶æ"
 
@@ -540,9 +542,9 @@ msgstr ""
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -558,8 +560,8 @@ msgid "Light Yellow Transition"
 msgstr ""
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -588,12 +590,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Czarny"
 
@@ -613,14 +617,14 @@ msgstr ""
 msgid "Photo CcMmYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Kolor"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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"
@@ -660,8 +664,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Wydrukuj"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Odcienie szaro¶ci"
@@ -818,12 +822,14 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Niebieskozielony"
 
@@ -831,12 +837,14 @@ msgstr "Niebieskozielony"
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Purpurowy"
 
@@ -844,12 +852,14 @@ msgstr "Purpurowy"
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "¯ó³æ"
 
@@ -857,9 +867,10 @@ msgstr "¯ó³æ"
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -867,8 +878,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -876,9 +887,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1110,7 +1122,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1198,131 +1210,142 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr ""
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 msgid "Manual Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Wysoko¶æ:"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 msgid "Light Cyan"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Czarny"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Czarny"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Czarny"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Czarny"
@@ -1553,86 +1576,78 @@ msgstr ""
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 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:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1686,104 +1701,105 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Koperty"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr ""
 
@@ -1791,8 +1807,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1925,8 +1941,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "Plik PPD:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "Plik PPD?"
@@ -1935,181 +1951,181 @@ msgstr "Plik PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Odcienie szaro¶ci"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Zwyk³y papier"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr ""
 
-#: 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
+#: 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 "Back Light Film"
 msgstr ""
 
-#: 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: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 "Matte Paper Heavyweight"
+msgstr ""
+
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Zwyk³y papier"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2163,86 +2179,97 @@ msgstr ""
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Ustawienia drukarki"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Ustawienia drukarki"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jasno¶æ:"
@@ -3644,645 +3671,698 @@ msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4376,30 +4456,30 @@ msgstr "Ustaw domy¶lne"
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Drukowanie v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "Informacje o"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4407,7 +4487,7 @@ msgstr ""
 "Ustawienia drukowania\n"
 "i zapisu"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4415,15 +4495,15 @@ msgstr ""
 "Zapisz\n"
 "ustawienia"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Podgl±d"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4437,249 +4517,249 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Wymiary:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Szeroko¶æ:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Wysoko¶æ:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "Po³o¿enie"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Portret"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Pejza¿"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "Z góry na dó³"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Pejza¿"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "U³o¿enie:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "Lewa:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 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:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Prawa:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Góra:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 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:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Dó³:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "Poziomo"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Oba"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "Pionowo"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Ustawienia drukarki"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 msgid "Select the make of your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "Plik PPD:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Przegl±daj"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 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:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 msgid "Enter the name you wish to give this logical printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 msgid ""
 "\n"
 "\n"
@@ -4703,149 +4783,149 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Ustawienia drukarki"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 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:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Skalowanie:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 msgid "Set the print size to the size of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "Regulacja koloru wydruku"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Ustaw domy¶lne"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Podgl±d obrazu"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednostki:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Jednostki:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr ""
 
@@ -4982,15 +5062,15 @@ msgstr "Polish"
 msgid "ISOLatin1"
 msgstr "ISOLatin2"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5164,18 +5244,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5184,7 +5265,8 @@ msgstr ""
 "\n"
 "Nie mo¿na zapisaæ do %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5199,82 +5281,82 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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:927
-#, c-format
-msgid "Printer does not support listing ink types!\n"
-msgstr ""
-
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, 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:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Mo¿na podaæ tylko jeden model drukarki."
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Czyszczenie g³owic...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5313,7 +5395,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5349,12 +5431,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5366,38 +5448,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr ""
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1530
 #, 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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5407,44 +5489,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5455,12 +5537,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5468,42 +5550,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5512,7 +5594,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr ""
@@ -5649,6 +5731,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "¯ó³æ"
 
diff --git a/po/pt.gmo b/po/pt.gmo
index 906ed28..acd518e 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index 7e6a140..a686b8c 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -15,6 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "Definir Valores Padrão"
@@ -292,9 +293,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Papel Normal"
 
@@ -304,9 +305,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Papel Normal"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Transparências"
 
@@ -347,9 +348,10 @@ msgid "Photo Paper Pro"
 msgstr "Papel de Fotografia Profissional"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Outro"
 
@@ -413,7 +415,7 @@ msgstr "Fonte do \"media\" para o qual está a imprimir"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Resolução"
 
@@ -554,9 +556,9 @@ msgstr "Ciano Claro"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -574,8 +576,8 @@ msgid "Light Yellow Transition"
 msgstr "Ciano Claro"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -605,12 +607,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Preto"
 
@@ -630,14 +634,14 @@ msgstr "Cor CcMmY de Fotografia"
 msgid "Photo CcMmYK Color"
 msgstr "Cor CcMmYK de Fotografia<"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Cor"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -678,8 +682,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimir"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Escala de Cinzento"
@@ -841,12 +845,14 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Ciano"
 
@@ -855,12 +861,14 @@ msgstr "Ciano"
 msgid "Adjust the cyan gamma"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -869,12 +877,14 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Amarelo"
 
@@ -883,9 +893,10 @@ msgstr "Amarelo"
 msgid "Adjust the yellow gamma"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -894,8 +905,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -904,9 +915,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1146,7 +1158,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1237,135 +1249,146 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "Rolo de Alimentação"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manual"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Auto Seleccionar"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Altura"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Seis Cores Foto"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Ciano Claro"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Preto"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarelo"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papel Mate"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel de Fotografia"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Filme Lustroso"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Preto"
@@ -1612,87 +1635,79 @@ msgstr "Ciano Claro"
 msgid "Medium Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 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:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1746,104 +1761,105 @@ 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: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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 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: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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 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: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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Cinco Cores Foto Compósito"
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Filme Lustroso"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Envelopes"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Papel Mate"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Papel para Impressora Jacto de Tinta"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 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: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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Papel de Fotografia"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografia Brilhante Premium"
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel de Qualidade Fotografica Lustroso"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado Ilford"
 
@@ -1851,8 +1867,8 @@ msgstr "Papel Pesado Ilford"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1992,8 +2008,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "Ficheiro PPD:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "Ficheiro PPD?"
@@ -2002,181 +2018,181 @@ msgstr "Ficheiro PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 msgid "Two Level Grayscale"
 msgstr "Escala de Cinzento de 2 Níveis"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr "Quato Tons"
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Cores Compósito Realçado"
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 msgid "Seven Color Photo"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Três Cores Compósito"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Três Cores Compósito"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Cores Compósito Realçado"
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Papel Normal Carregação Rápida"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Cartão"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr "Película"
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "Papel Mate"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papel ColorLife"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papel Mate"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2234,88 +2250,99 @@ msgstr "1200 DPI alta qualidade"
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI qualidade máxima"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Nome da Impressora:"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nome da Impressora:"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brilho:"
@@ -3717,645 +3744,698 @@ msgstr "Stylus c20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4453,30 +4533,30 @@ msgstr "Definir Valores Padrão"
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Imprimir v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "Acerca"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4484,21 +4564,21 @@ msgstr ""
 "Imprimir e\n"
 "Gravar Definições"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
 msgstr "Gravar Definições"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4526,76 +4606,76 @@ msgstr ""
 "sua\n"
 "posição original."
 
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Dimensões:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Largura:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr "Largura do papel para o qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Altura"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
 msgstr "Altura do papel para o qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "Posição"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Retrato"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Paisagem"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "De cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Paisagem de cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4603,124 +4683,124 @@ msgstr ""
 "Seleccione a orientação: retrato, paisagem, cabeça para baixo, ou paisagem "
 "de cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "Orientação:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "Esquerda:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 msgid "Distance from the left of the paper to the image"
 msgstr "Distância da esquerda do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Direita:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the right of the paper to the image"
 msgstr "Distância da direita do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Topo:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the top of the paper to the image"
 msgstr "Distência do topo do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Fundo:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Distância do fundo do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Centro:"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontalmente"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Centrar a imagem horizontalmente no papel"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Ambos"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Centrar a imagem no papel"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "Verticalmente"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Centrar a imagem verticalmente no papel"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Configurar a Impressora"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Seleccione o seu modelo de impressora"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Modelo da Impressora:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Seleccione o seu modelo de impressora"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "Ficheiro PPD:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Insira o ficheiro PPD correct para a sua impressora"
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Seleccione o ficheiro PPD correcto para a sua impressora"
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4729,54 +4809,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:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, 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:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "impressão de teste"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Definir nova Impressora"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 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:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Acerca do Gimp-Print "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Versão do Gimp-Print "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid ""
 "\n"
@@ -4821,11 +4901,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:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Definições da Impressora"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4833,11 +4913,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:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Configurar Impressora..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4846,11 +4926,11 @@ msgstr ""
 "imprimir\n"
 "para esta impressora"
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "Nova Impressora..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4858,24 +4938,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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Redimesionamento:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Definir a escala (tamanho) da imagem"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4883,31 +4963,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:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Precentagem"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 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:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 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:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Definir a largura da impressão"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Definir a altura da impressão"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4915,69 +4995,69 @@ msgstr ""
 "Usar Original\n"
 "Tamanho de Imagem"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 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:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "Ajustamento da Cor de Impressão"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Definir Valores Padrão"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Previsualização da Imagem"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "Tipo de Output:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Tipo de Output:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "Seleccione o tipo de output desejado"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Ajustar o Output..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 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:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "Seleccione a base das unidades de medida para impressão"
 
@@ -5118,15 +5198,15 @@ msgstr "Portuguese"
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5395,18 +5475,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5415,7 +5496,8 @@ msgstr ""
 "\n"
 "Não foi possível escrever para %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5433,83 +5515,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:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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: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:976 src/escputil/escputil.c:1071
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Cor da Tinta"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Percentagem restante"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, 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:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, 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:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Você só pode especificar um modelo de impressora"
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Limpando as cabeças...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5594,7 +5676,7 @@ msgstr ""
 "procedimento.\n"
 "\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5669,12 +5751,12 @@ msgstr ""
 "os resultados. É essencial que você não desligue a impressora durante este "
 "procedimento.\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5693,20 +5775,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:1420 src/escputil/escputil.c:1427
-#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, 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:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5715,7 +5797,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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5724,12 +5806,12 @@ msgstr ""
 "Por favor confirme, carregando em 'r' outra vez, que deseja repetir\n"
 "o processo de alinhamento:\n"
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repetindo o processo de alinhamento.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5744,17 +5826,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:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "Prestes a gravar as configurações..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "falhou!\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5763,28 +5845,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:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "sucesso!\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Comando desconhecido.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "O comando final não foi confirmado.\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5801,12 +5883,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:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Pressione enter para continuar > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5817,42 +5899,42 @@ msgstr ""
 "padrão.\n"
 "Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n"
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "Passagem #%d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, 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:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Número fora do intervalo|\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Eu não consigo intender o que escreveu!\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, 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:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentando definir o alinhamento..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "sucesso.\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5867,7 +5949,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:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "Erro no input\n"
@@ -6004,6 +6086,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Obtenção da próxima linha falhou em %.0f\n"
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Não é possivel processar o output da impressora\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
diff --git a/po/sk.gmo b/po/sk.gmo
index 9b604f1..8e1bd40 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index ca6ab78..f350164 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -17,6 +17,7 @@ msgstr ""
 "X-Generator: KBabel 0.9.5\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "Nastavi» ¹tandardné"
@@ -295,9 +296,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Obyèajný papier"
 
@@ -307,9 +308,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Obyèajný papier"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Priesvitná fólia"
 
@@ -350,9 +351,10 @@ msgid "Photo Paper Pro"
 msgstr "Foto papier pro"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Iné"
 
@@ -416,7 +418,7 @@ msgstr "Zdroj (vstupné miesto) média, na ktoré tlaèíte"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Rozlí¹enie"
 
@@ -557,9 +559,9 @@ msgstr "Jasná azúrová"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -577,8 +579,8 @@ msgid "Light Yellow Transition"
 msgstr "Jasná azúrová"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -608,12 +610,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Èierna"
 
@@ -633,14 +637,14 @@ msgstr "Fotografická CcMmY farba"
 msgid "Photo CcMmYK Color"
 msgstr "Fotografická CcMmYK farba"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farebne"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -681,8 +685,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Tlaèi»"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "V odtieòoch ¹edej"
@@ -843,12 +847,14 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Azúrová"
 
@@ -857,12 +863,14 @@ msgstr "Azúrová"
 msgid "Adjust the cyan gamma"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Purpurová"
 
@@ -871,12 +879,14 @@ msgstr "Purpurová"
 msgid "Adjust the magenta gamma"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "®ltá"
 
@@ -885,9 +895,10 @@ msgstr "®ltá"
 msgid "Adjust the yellow gamma"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -896,8 +907,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -906,9 +917,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1148,7 +1160,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1239,135 +1251,146 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "©tandardný"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "Kotúèový podávaè"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuál"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tlaèi» do súboru?"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výber"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Vý¹ka:"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Jasná azúrová"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Jasná purpurová"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Èierna"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "®ltá"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matný papier"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotografický papier"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý film"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Èierna"
@@ -1614,87 +1637,79 @@ msgstr "Jasná azúrová"
 msgid "Medium Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tlaèi» do súboru?"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 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:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "Veµkos»"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1748,104 +1763,105 @@ msgid "test print"
 msgstr "Test tlaèe"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 msgid "Four Color Standard"
 msgstr "©tandardný ¹tvorfarebný"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 msgid "Three Color Composite"
 msgstr "Kompozitný trojfarebný"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Kompozitný fotografický pä»farebný"
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Lesklý film"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Obálky"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Matný papier"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Papier pre atramentovú tlaèiareò"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier s fotografickou kvalitou"
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotografický papier"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Lesklý foto papier Premium"
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Ligotavý foto papier Premium"
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý fotografický papier"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr "Ilford »a¾ký papier"
 
@@ -1853,8 +1869,8 @@ msgstr "Ilford »a¾ký papier"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1994,8 +2010,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD súbor:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD súbor?"
@@ -2004,183 +2020,183 @@ msgstr "PPD súbor?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "V odtieòoch ¹edej"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr "Kompozitný roz¹írený ¹es»farebný"
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr "Roz¹írený sedemfarebný"
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Roz¹írený sedemfarebný"
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Kompozitný trojfarebný"
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Kompozitný trojfarebný"
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Kompozitný roz¹írený ¹es»farebný"
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Roz¹írený sedemfarebný"
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Obyèajný papier rýchle nasadenie"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Pohµadnica"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr ""
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "Matný papier"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Lesklý foto papier Premium"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Obyèajný papier"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matný papier"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2238,88 +2254,99 @@ msgstr "1200 DPI Vysoká kvalita"
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI Najvy¹¹ia kvalita"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Názov tlaèiarne:"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Názov tlaèiarne:"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
@@ -3722,645 +3749,698 @@ msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4458,30 +4538,30 @@ msgstr "Nastavi» ¹tandardné"
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Storno"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Tlaè v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "O programe"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4489,7 +4569,7 @@ msgstr ""
 "Ulo¾i» nastavenia\n"
 "a vytlaèi»"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4497,15 +4577,15 @@ msgstr ""
 "Ulo¾i»\n"
 "nastavenia"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Tlaèi»"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Náhµad"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4529,200 +4609,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:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "Veµkos»"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Rozmery:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "©írka:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr "©írka papiera, na ktorý chcete tlaèi»"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Vý¹ka:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
 msgstr "Vý¹ka papiera, na ktorý chcete tlaèi»"
 
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Veµkos»"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "Pozícia"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Na vý¹ku"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Na ¹írku"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "Hore nohami"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Na ¹írku"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 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:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "Orientácia:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "¥avý:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 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:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Pravý:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Horný:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 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:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Dolný:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Centrovanie:"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "Vodorovne"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Vycentrova» vodorovne obrázok na papieri"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Oboje"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Vycentrova» obrázok na papieri"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "Zvislo"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Vycentrova» obrázok zvisle na papieri"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Nastavi» tlaèiareò"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Názov tlaèiarne:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Vyberte model va¹ej tlaèiarne"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Model tlaèiarne:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Vyberte model va¹ej tlaèiarne"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "PPD súbor:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 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:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Prechádza»"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 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:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4731,54 +4811,54 @@ msgstr ""
 "Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
 "tlaèi»"
 
-#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Názov tlaèiarne:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, 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:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "Test tlaèe"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "Tlaèi» do súboru?"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Názov tlaèiarne:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 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:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "O Gimp-Print "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Verzia Gimp-Print"
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid ""
 "\n"
@@ -4824,11 +4904,11 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA.\n"
 
-#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Nastavenie tlaèiarne"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4836,11 +4916,11 @@ msgstr ""
 "Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
 "tlaèi»"
 
-#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Nastavenie tlaèiarne..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4848,11 +4928,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:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "Nová tlaèiareò..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4860,24 +4940,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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "Veµkos»"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Zmena:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Nastavi» zväè¹enie (veµkos») obrázku"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4885,31 +4965,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:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Percentá"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany"
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 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:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Nastavi» ¹írku tlaèe"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Nastavi» vý¹ku tlaèe"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4917,68 +4997,68 @@ msgstr ""
 "Pou¾i» pôvodnú\n"
 "veµkos» obrázka"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 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:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "Prispôsobenie farieb pre tlaè"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Nastavi» ¹tandardné"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Zatvori»"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Náhµad obrázku"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "Zvoµte vytú¾ený typ výstupu"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Prispôsobi» výstup..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 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:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "Zvoli» základnú mernú jednotku pre tlaè"
 
@@ -5119,15 +5199,15 @@ msgstr "Slovak"
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5410,18 +5490,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5430,7 +5511,8 @@ msgstr ""
 "\n"
 "Nie je mo¾né zapisova» do %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5448,82 +5530,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:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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: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:976 src/escputil/escputil.c:1071
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Farebný atrament"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Zostávajúce percentá"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, fuzzy, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr "Tlaèiareò nepodporuje farebný výstup\n"
+
+#: src/escputil/escputil.c:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, 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:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Èistenie hláv...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5598,7 +5680,7 @@ msgstr ""
 "toho procesu nevypli tlaèiareò\n"
 "\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5668,12 +5750,12 @@ msgstr ""
 "nevypli tlaèiareò\n"
 "\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5692,20 +5774,20 @@ msgstr ""
 "Potom bude po¾iadaný potvrdi» va¹u voµbu.\n"
 "Èo chcete spravi»? (s,q,r)?\n"
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, 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:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5714,7 +5796,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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5723,12 +5805,12 @@ msgstr ""
 "Opätovným stlaèení 'r' potvrïte, ¾e si prajete zopakova» proces "
 "zarovnávania:\n"
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Opakujem proces zarovnávania.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5743,17 +5825,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:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "O nastaveniach ukladania..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "zlyhalo!\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5762,27 +5844,27 @@ msgstr ""
 "Va¹e nastavenie sa nepodarilo úspe¹ne ulo¾i». Musíte zopakova»\n"
 "procedúru zarovnávania.\n"
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "úspe¹ne!\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Neznámy príkaz.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Závereèný príkaz nebol potvrdený.\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5799,12 +5881,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:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Pre pokraèovanie stlaète enter > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5814,42 +5896,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:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "Prechod #%d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, 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:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Èíslo je mimo rozsahu!\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nedoká¾em pochopi», èo ste napísali!\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, 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:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Pokú¹am sa nastavi» zarovnávanie..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "úspe¹né.\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5862,7 +5944,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:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "Chyba na vstupe\n"
@@ -5999,6 +6081,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Nie je mo¾né analyzova» výstup z tlaèiarne\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 66aa5ad..faaa933 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 158128c..8acb8f0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -17,6 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 #, fuzzy
 msgid "Default"
 msgstr "Ställ in standardvärden"
@@ -294,9 +295,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400×600 DPI"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "Vanligt papper"
 
@@ -306,9 +307,9 @@ msgid "Plain Paper PIXMA"
 msgstr "Vanligt papper"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "Genomskinligheter"
 
@@ -349,9 +350,10 @@ msgid "Photo Paper Pro"
 msgstr "Professionellt fotopapper"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "Annat"
 
@@ -415,7 +417,7 @@ msgstr "Källa (inmatningsfack) med media som du skriver ut till"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "Upplösning"
 
@@ -556,9 +558,9 @@ msgstr "Ljus cyan"
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -576,8 +578,8 @@ msgid "Light Yellow Transition"
 msgstr "Ljus cyan"
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -607,12 +609,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "Svart"
 
@@ -632,14 +636,14 @@ msgstr "CcMmY-fotofärg"
 msgid "Photo CcMmYK Color"
 msgstr "CcMmYK-fotofärg"
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Färg"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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
@@ -680,8 +684,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Gråtoner"
@@ -843,12 +847,14 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -857,12 +863,14 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -871,12 +879,14 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Justera magentabalansen på utskriften"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "Gult"
 
@@ -885,9 +895,10 @@ msgstr "Gult"
 msgid "Adjust the yellow gamma"
 msgstr "Justera gulbalansen på utskriften"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr ""
 
@@ -896,8 +907,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr ""
 
@@ -906,9 +917,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Justera magentabalansen på utskriften"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr ""
 
@@ -1148,7 +1160,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1239,136 +1251,147 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr "Rullmatning"
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 #, fuzzy
 msgid "Print to CD"
 msgstr "Skriv ut till fil?"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Välj automatiskt"
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Höjd:"
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografi"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 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:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Sexfärgs foto"
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Ljus cyan"
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Ljus magenta"
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 #, fuzzy
 msgid "Light Black"
 msgstr "Svart"
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gult"
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matte-papper"
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapper"
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glansig film"
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Svart"
@@ -1615,87 +1638,79 @@ msgstr "Ljus cyan"
 msgid "Medium Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut till fil?"
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 #, fuzzy
 msgid "Automatic"
 msgstr "Storlek"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI enkelriktad"
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI enkelriktad"
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, 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:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1750,107 +1765,108 @@ 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: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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 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: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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 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: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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 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: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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr "Femfärgsfoto sammansatt"
 
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "Glansig film"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "Kuvert"
 
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "Matte-papper"
 
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "Bläckstrålepapper"
 
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "Bläckstrålepapper med fotokvalitet"
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "Fotopapper"
 
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "Premiumglansigt fotopapper"
 
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "Fotopapper med premiumlyster"
 
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "Glansigt papper med fotokvalitet"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr "Tungt Ilford-papper"
 
@@ -1858,8 +1874,8 @@ msgstr "Tungt Ilford-papper"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1999,8 +2015,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD-fil:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD-fil?"
@@ -2009,199 +2025,199 @@ msgstr "PPD-fil?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 msgid "Two Level Grayscale"
 msgstr "Tvånivås gråton"
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
 #, 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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr "Quadtone"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 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:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 msgid "Seven Color Photo"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 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:1410
+#: src/main/escp2-channels.c:1535
 #, 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
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 #, 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:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Fyrfärgs standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Trefärgers sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 #, 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: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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Fyrfärgs standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 #, 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:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Sexfärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 #, 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:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sjufärgs förbättrad"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 #, 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sexfärgs foto"
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr "Snabbladdning av vanligt papper"
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Vykort"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr "Bakljusfilm"
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr "Matte-papper"
 
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premiumglansigt fotopapper"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "ColorLife-papper"
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matte-papper"
 
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2259,88 +2275,99 @@ msgstr "1200 DPI hög kvalitet"
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "2880 × 720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 × 360 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 × 360 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 × 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivarnamn:"
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivarnamn:"
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Ljusstyrka:"
@@ -3743,645 +3770,698 @@ msgstr "Stylus C20sx"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4479,30 +4559,30 @@ msgstr "Ställ in standardvärden"
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "OK"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Utskrift v%s"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4510,7 +4590,7 @@ msgstr ""
 "Skriv ut och\n"
 "spara inställningar"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4518,15 +4598,15 @@ msgstr ""
 "Spara\n"
 "inställningar"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "Förhandsgranskning"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4550,200 +4630,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:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 #, fuzzy
 msgid "Paper Size"
 msgstr "Storlek"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "Dimensioner:"
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "Bredd:"
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 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:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "Höjd:"
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 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:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Storlek"
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 #, fuzzy
 msgid "Image Position"
 msgstr "Position"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "Automatik"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "Stående"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "Liggande"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "Uppochner"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "Liggande uppochner"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 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:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "Vänster:"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 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:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "Höger:"
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 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:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 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:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "Övre kant:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 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:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "Nedre kant:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 #, 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:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 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:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "Centrera:"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horisontellt"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "Centrera bilden horisontellt på pappret"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "Både och"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "Centrera bilden på pappret"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertikalt"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "Centrera bilden vertikalt på pappret"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "Konfigurera skrivare"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Skrivarnamn:"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Välj din skrivarmodell"
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "Skrivarmodell:"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "Välj din skrivarmodell"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "PPD-fil:"
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Ange rätt PPD-filnamn för din skrivare"
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "Bläddra"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Välj rätt PPD-filnamn för din skrivare"
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4752,54 +4832,54 @@ msgstr ""
 "Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
 "skriva ut till"
 
-#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Skrivarnamn:"
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, 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:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 #, fuzzy
 msgid "File to print to"
 msgstr "testutskrift"
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 #, fuzzy
 msgid "Print To File"
 msgstr "Skriv ut till fil?"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "Ange ny skrivare"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "Skrivarnamn:"
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 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:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Om Gimp-Print "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print version "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid ""
 "\n"
@@ -4862,11 +4942,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:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "Skrivarinställningar"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4874,11 +4954,11 @@ msgstr ""
 "Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
 "skriva ut till"
 
-#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "Konfigurera skrivare..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4886,11 +4966,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:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "Ny skrivare..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4898,24 +4978,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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 #, fuzzy
 msgid "Image Size"
 msgstr "Storlek"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "Skalning:"
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "Ändra skalningen (storleken) på bilden"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4923,31 +5003,31 @@ msgstr ""
 "Välj huruvida skalning mäts i procent av tillgänglig sidstorlek eller antal "
 "utdatapunkter per tum"
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr "Skala utskriften till storleken på sidan"
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skala utskriften till antalet punkter per tum"
 
-#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "Ställ in bredden på utskriften"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "Ställ in bredden på utskriften"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4955,68 +5035,68 @@ msgstr ""
 "Använd\n"
 "originalbildstorlek"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 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:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "Justera utskriftsfärg"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr "Ställ in standardvärden"
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "Förhandsgranskning av bild"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 #, fuzzy
 msgid "Output"
 msgstr "Utdatatyp:"
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr "Utdatatyp:"
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "Välj önskad typ av utdata"
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "Justera utdata..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 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:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 #, fuzzy
 msgid "Size Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "Välj grundenheten för utskrift"
 
@@ -5159,15 +5239,15 @@ msgstr "Swedish"
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5457,18 +5537,19 @@ 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:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, 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:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, 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:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -5477,7 +5558,8 @@ msgstr ""
 "\n"
 "Kan inte skriva till %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -5495,84 +5577,84 @@ msgstr ""
 "Kan inte detektera skrivartyp.\n"
 "Använd flaggan -m för att ange din skrivarmodell.\n"
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:908
+#: src/escputil/escputil.c:927
 #, 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: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: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:976 src/escputil/escputil.c:1071
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "Bläckfärg"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr "Återstående procent"
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, fuzzy, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr "Skrivaren stöder inte färgutskrift\n"
+
+#: src/escputil/escputil.c:1144
 #, 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:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, 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:1289
+#: src/escputil/escputil.c:1389
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Du kan endast ange en skrivarmodell."
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Rensar huvuden...\n"
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, 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:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5646,7 +5728,7 @@ msgstr ""
 "Det är viktigt att du inte stänger av din skrivare under denna process.\n"
 "\n"
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5714,12 +5796,12 @@ msgstr ""
 "process.\n"
 "\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, 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:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5738,20 +5820,20 @@ msgstr ""
 "Du kommer att få bekräfta ditt val.\n"
 "Vad vill du göra (s, q, r)?\n"
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, 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:1430
+#: src/escputil/escputil.c:1530
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5760,7 +5842,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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5769,12 +5851,12 @@ msgstr ""
 "Bekräfta att du vill upprepa justeringsprocessen genom att\n"
 "ange \"r\" igen:\n"
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Upprepar justeringsprocessen.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5789,17 +5871,17 @@ msgstr ""
 "Bekräfta att du vill spara ändringarna i skrivaren genom att ange\n"
 "\"s\" igen:\n"
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "Kommer att spara inställningar..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "misslyckades!\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5808,27 +5890,27 @@ msgstr ""
 "Dina inställningar sparades inte utan problem. Du måste upprepa\n"
 "justeringsproceduren.\n"
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "lyckades!\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, 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:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Okänt kommando.\n"
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Sista kommandot bekräftades inte.\n"
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5845,12 +5927,12 @@ msgstr ""
 "Placera ett pappersark i skrivaren för att påbörja justeringen\n"
 "av huvudena.\n"
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "Tryck retur för att fortsätta > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5861,42 +5943,42 @@ msgstr ""
 "Skriv in ett parnummer, \"?\" för hjälp, eller \"r\" för att upprepa "
 "proceduren.\n"
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "Pass %d"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Mata in ett nytt pappersark.\n"
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Numret är utanför intervallet!\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Jag kan inte förstå vad du skrev!\n"
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, 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:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Försöker ställa in justering..."
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "lyckades.\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5909,7 +5991,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:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr "Fel i indata\n"
@@ -6046,6 +6128,10 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
 
 #, fuzzy
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "Kan inte tolka utdata från skrivare\n"
+
+#, fuzzy
 #~ msgid "Red Balance"
 #~ msgstr "Justera gulbalansen på utskriften"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 8f77f5c..62ac886 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6833c5d..d860213 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-11-22 14:52+0000\n"
+"POT-Creation-Date: 2006-01-14 15:38-0500\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"
@@ -15,6 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:1527
 msgid "Default"
 msgstr "�設"
 
@@ -257,9 +258,9 @@ msgid "2400x2400 DPI DMT"
 msgstr "2400x2400 DPI DMT"
 
 #: 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
+#: 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 "Plain Paper"
 msgstr "普通紙張"
 
@@ -269,9 +270,9 @@ msgid "Plain Paper PIXMA"
 msgstr "普通紙張"
 
 #: 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
+#: 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 "Transparencies"
 msgstr "�明膠片"
 
@@ -317,9 +318,10 @@ msgid "Photo Paper Pro"
 msgstr "專業級相紙"
 
 #: 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
+#: 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 src/main/escp2-papers.c:1428
+#: src/main/escp2-papers.c:1438
 msgid "Other"
 msgstr "其它"
 
@@ -379,7 +381,7 @@ msgstr "�紙匣或者紙張的來�"
 
 #: 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
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1282
 msgid "Resolution"
 msgstr "解�度"
 
@@ -509,9 +511,9 @@ msgstr ""
 #: 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-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
+#: 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
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
@@ -527,8 +529,8 @@ msgid "Light Yellow Transition"
 msgstr ""
 
 #: 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
+#: src/main/escp2-resolutions.c:479 src/main/escp2-resolutions.c:487
+#: src/main/escp2-resolutions.c:498 src/main/escp2-resolutions.c:510
 msgid "Off"
 msgstr ""
 
@@ -557,12 +559,14 @@ 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
+#: 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:647
+#: src/main/print-escp2-data.c:659 src/main/print-escp2-data.c:671
+#: src/main/print-escp2-data.c:684 src/main/print-escp2-data.c:697
+#: src/main/print-escp2-data.c:703 src/main/print-escp2-data.c:727
+#: src/main/print-escp2-data.c:740 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2145 src/gutenprintui2/panel.c:2144
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:884
 msgid "Black"
 msgstr "黑"
 
@@ -582,14 +586,14 @@ msgstr ""
 msgid "Photo CcMmYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1785
 #: 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:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "彩色"
 
-#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1787
 #: 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"
@@ -627,8 +631,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr ""
 
-#: 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/main/print-color.c:121 src/main/escp2-channels.c:820
+#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
 #: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "�階"
@@ -774,12 +778,14 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr "程�使用的 Gamma 值"
 
-#: 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
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:618
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:637
+#: src/main/print-escp2-data.c:648 src/main/print-escp2-data.c:660
+#: src/main/print-escp2-data.c:672 src/main/print-escp2-data.c:685
+#: src/main/print-escp2-data.c:698 src/main/print-escp2-data.c:712
+#: src/main/print-escp2-data.c:726 src/main/print-escp2-data.c:741
+#: src/gutenprintui/panel.c:2124 src/gutenprintui2/panel.c:2123
+#: src/escputil/escputil.c:866 src/escputil/escputil.c:885
 msgid "Cyan"
 msgstr "æ°°è—�"
 
@@ -787,12 +793,14 @@ msgstr "æ°°è—�"
 msgid "Adjust the cyan gamma"
 msgstr "調整氰�色 gamma 值"
 
-#: 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
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:619
+#: src/main/print-escp2-data.c:629 src/main/print-escp2-data.c:638
+#: src/main/print-escp2-data.c:649 src/main/print-escp2-data.c:662
+#: src/main/print-escp2-data.c:673 src/main/print-escp2-data.c:686
+#: src/main/print-escp2-data.c:699 src/main/print-escp2-data.c:711
+#: src/main/print-escp2-data.c:725 src/main/print-escp2-data.c:742
+#: src/gutenprintui/panel.c:2131 src/gutenprintui2/panel.c:2130
+#: src/escputil/escputil.c:867 src/escputil/escputil.c:886
 msgid "Magenta"
 msgstr "æ´‹ç´…"
 
@@ -800,12 +808,14 @@ msgstr "æ´‹ç´…"
 msgid "Adjust the magenta gamma"
 msgstr "調整洋紅色 gamma 值"
 
-#: 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
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:628 src/main/print-escp2-data.c:639
+#: src/main/print-escp2-data.c:650 src/main/print-escp2-data.c:664
+#: src/main/print-escp2-data.c:674 src/main/print-escp2-data.c:687
+#: src/main/print-escp2-data.c:700 src/main/print-escp2-data.c:710
+#: src/main/print-escp2-data.c:724 src/main/print-escp2-data.c:743
+#: src/gutenprintui/panel.c:2138 src/gutenprintui2/panel.c:2137
+#: src/escputil/escputil.c:868 src/escputil/escputil.c:887
 msgid "Yellow"
 msgstr "黃"
 
@@ -813,9 +823,10 @@ msgstr "黃"
 msgid "Adjust the yellow gamma"
 msgstr "調整黃色 gamma 值"
 
-#: 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
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:715
+#: src/main/print-escp2-data.c:728 src/gutenprintui/panel.c:2152
+#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:875
+#: src/escputil/escputil.c:893
 msgid "Red"
 msgstr "ç´…"
 
@@ -823,8 +834,8 @@ msgstr "ç´…"
 msgid "Adjust the red gamma"
 msgstr "調整紅色 gamma 值"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
-#: src/gutenprintui2/panel.c:2146
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2159
+#: src/gutenprintui2/panel.c:2158
 msgid "Green"
 msgstr "綠"
 
@@ -832,9 +843,10 @@ msgstr "綠"
 msgid "Adjust the green gamma"
 msgstr "調整綠色 gamma 值"
 
-#: 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
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:716
+#: src/main/print-escp2-data.c:729 src/gutenprintui/panel.c:2166
+#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:876
+#: src/escputil/escputil.c:894
 msgid "Blue"
 msgstr "è—�"
 
@@ -1044,7 +1056,7 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1675
+#: src/main/print-color.c:1668
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1132,121 +1144,132 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:302 src/main/print-escp2-data.c:330
+#: src/main/print-escp2-data.c:367 src/main/print-escp2-data.c:422
+#: src/main/print-escp2-data.c:468 src/main/print-escp2-data.c:569
+#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:597
+#: src/main/print-escp2.c:1546 src/main/print-escp2.c:1638
+#: src/main/print-escp2.c:1650 src/main/print-pcl.c:227
+#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2584 src/gutenprintui2/panel.c:2609
 msgid "Standard"
 msgstr "標準"
 
-#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
-#: src/main/print-escp2-data.c:471
+#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:449
+#: src/main/print-escp2-data.c:477
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
+#: src/main/print-escp2-data.c:339 src/main/print-escp2-data.c:394
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
+#: src/main/print-escp2-data.c:348 src/main/print-escp2-data.c:403
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
+#: src/main/print-escp2-data.c:376 src/main/print-escp2-data.c:431
 msgid "Manual Feed"
 msgstr "人手�紙"
 
-#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
+#: src/main/print-escp2-data.c:385 src/main/print-escp2-data.c:440
 msgid "Print to CD"
 msgstr "列�至光碟"
 
-#: src/main/print-escp2-data.c:490
+#: src/main/print-escp2-data.c:496
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:499
+#: src/main/print-escp2-data.c:505
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:508
+#: src/main/print-escp2-data.c:514
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/print-escp2-data.c:517
+#: src/main/print-escp2-data.c:523
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:566 src/main/print-escp2-data.c:581
+#: src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:567 src/main/print-escp2-data.c:582
+#: src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:568 src/main/print-escp2-data.c:583
+#: src/main/print-escp2-data.c:596 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:570 src/main/print-escp2-data.c:585
+#: src/main/print-escp2-data.c:599 src/main/generic-options.c:37
 msgid "High"
 msgstr ""
 
-#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:571 src/main/print-escp2-data.c:586
+#: src/main/print-escp2-data.c:598 src/main/generic-options.c:38
 msgid "Photo"
 msgstr "相片"
 
-#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:572 src/main/print-escp2-data.c:587
+#: src/main/print-escp2-data.c:600 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:588
+#: src/main/print-escp2-data.c:601 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:574 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:602 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:651 src/main/print-escp2-data.c:661
+#: src/main/print-escp2-data.c:675 src/main/print-escp2-data.c:688
+#: src/main/print-escp2-data.c:701 src/main/print-escp2-data.c:738
+#: src/escputil/escputil.c:869
 msgid "Light Cyan"
 msgstr ""
 
-#: 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
+#: src/main/print-escp2-data.c:652 src/main/print-escp2-data.c:663
+#: src/main/print-escp2-data.c:676 src/main/print-escp2-data.c:689
+#: src/main/print-escp2-data.c:702 src/main/print-escp2-data.c:737
+#: src/escputil/escputil.c:870
 msgid "Light Magenta"
 msgstr ""
 
-#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
-#: src/escputil/escputil.c:871
+#: src/main/print-escp2-data.c:677 src/main/print-escp2-data.c:739
+#: src/escputil/escputil.c:873
 msgid "Light Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:620
+#: src/main/print-escp2-data.c:690
 msgid "Dark Yellow"
 msgstr ""
 
-#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
-#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
+#: src/main/print-escp2-data.c:713 src/main/escp2-channels.c:2439
+#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:874
 msgid "Matte Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
-#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:714 src/main/escp2-channels.c:2435
+#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:864
 msgid "Photo Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
+#: src/main/print-escp2-data.c:717 src/escputil/escputil.c:877
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#: src/main/print-escp2-data.c:736 src/escputil/escputil.c:878
 msgid "Light Light Black"
 msgstr ""
 
@@ -1466,81 +1489,73 @@ msgstr ""
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:532
-msgid "Red and Blue Ink Usage"
-msgstr ""
-
-#: src/main/print-escp2.c:533
-msgid "Amount of red and blue ink to use"
-msgstr ""
-
-#: src/main/print-escp2.c:1387
+#: src/main/print-escp2.c:1443
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1389
+#: src/main/print-escp2.c:1445
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1456 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "5 �光碟"
 
-#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1458 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "3 �光碟"
 
-#: src/main/print-escp2.c:1424
+#: src/main/print-escp2.c:1480
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1426
+#: src/main/print-escp2.c:1482
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1507 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
+#: src/main/print-escp2.c:1617 src/cups/genppd.c:1291
 msgid "Automatic"
 msgstr "自動"
 
-#: src/main/print-escp2.c:1580
+#: src/main/print-escp2.c:1619
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1582
+#: src/main/print-escp2.c:1621
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1615
+#: src/main/print-escp2.c:1652
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1617
+#: src/main/print-escp2.c:1654
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1619
+#: src/main/print-escp2.c:1656
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1621
+#: src/main/print-escp2.c:1658
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1623
+#: src/main/print-escp2.c:1660
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2026
+#: src/main/print-escp2.c:2057
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
+#: src/main/print-escp2.c:2996 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1594,111 +1609,112 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: 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
+#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
+#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
+#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
+#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
+#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: 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
+#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
+#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
+#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
+#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: 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
+#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
+#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
+#: src/main/escp2-channels.c:1662
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: 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
+#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
+#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
+#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
 msgid "Five Color Photo Composite"
 msgstr ""
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:861 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 "Glossy Film"
 msgstr "光�膠片"
 
-#: 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
+#: src/main/print-lexmark.c:869 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 "Envelopes"
 msgstr "ä¿¡å°�"
 
 # (Abel) from fuji, epson
-#: 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
+#: src/main/print-lexmark.c:873 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 "Matte Paper"
 msgstr "雪�銅版紙"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:877 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 "Inkjet Paper"
 msgstr "噴墨專用紙"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
+#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1408
 msgid "Photo Quality Inkjet Paper"
 msgstr "優質噴墨專用紙"
 
-#: 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
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
+#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1410
 msgid "Photo Paper"
 msgstr "相紙"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1184
+#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
+#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
 msgid "Premium Glossy Photo Paper"
 msgstr "頂級光�相紙"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1188
+#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
+#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
+#: src/main/escp2-papers.c:1416
 msgid "Premium Luster Photo Paper"
 msgstr "精�光�相紙"
 
 # (Abel) from Epson
-#: 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
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1190
+#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
+#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
+#: src/main/escp2-papers.c:1422
 msgid "Photo Quality Glossy Paper"
 msgstr "光�紙"
 
-#: 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
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1192
+#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
+#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
+#: src/main/escp2-papers.c:1424
 msgid "Ilford Heavy Paper"
 msgstr ""
 
@@ -1706,8 +1722,8 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
-#: src/cups/genppd.c:1463
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1407 src/cups/genppd.c:1422
+#: src/cups/genppd.c:1470
 msgid "None"
 msgstr ""
 
@@ -1840,8 +1856,8 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD 檔"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
-#: src/gutenprintui2/panel.c:1737
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1749
+#: src/gutenprintui2/panel.c:1749
 msgid "PPD File"
 msgstr "PPD 檔"
 
@@ -1849,163 +1865,164 @@ msgstr "PPD 檔"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
+#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#, fuzzy
 msgid "Three Level Grayscale"
-msgstr ""
+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
+#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
+#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
+#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
+#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
+#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
-#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
+#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
+#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1373
+#: src/main/escp2-channels.c:1498
 msgid "Seven Color Enhanced"
 msgstr ""
 
-#: src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1535
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1555
+#: src/main/escp2-channels.c:1695
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
 msgid "Two Color Raw"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
+#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
+#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
+#: src/main/escp2-channels.c:1829
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1622
+#: src/main/escp2-channels.c:1762
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: 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
+#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
+#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
+#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1884
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
+#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
-#: src/main/escp2-channels.c:1810
+#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
+#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1816
+#: src/main/escp2-channels.c:1962
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
-#: src/main/escp2-channels.c:1861
+#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
+#: src/main/escp2-channels.c:2007
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:2024
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1896
+#: src/main/escp2-channels.c:2042
 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
+#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
+#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
+#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
+#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
+#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
+#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
+#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
+#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
 msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
+#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: 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
+#: 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 "Plain Paper Fast Load"
 msgstr ""
 
-#: 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/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
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "明信片"
 
-#: 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
+#: 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 "Back Light Film"
 msgstr ""
 
-#: 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
+#: 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 "Matte Paper Heavyweight"
 msgstr ""
 
 # (Abel) from Epson
-#: 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
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
 msgid "Premium Semigloss Photo Paper"
 msgstr "頂級柔光相紙"
 
-#: 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
+#: 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 src/main/escp2-papers.c:1426
 msgid "ColorLife Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
-#: src/main/escp2-papers.c:1408
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1418
 msgid "Archival Matte Paper"
 msgstr ""
 
 # (Abel) from Epson
-#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
-#: src/main/escp2-papers.c:1410
+#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
+#: src/main/escp2-papers.c:1420
 msgid "Watercolor Paper - Radiant White"
 msgstr "水彩紙-亮白色"
 
@@ -2054,79 +2071,90 @@ msgstr ""
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:101 src/main/escp2-resolutions.c:104
+#: src/main/escp2-resolutions.c:100
+#, fuzzy
+msgid "720 x 720 DPI"
+msgstr "720x720 DPI"
+
+#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:119
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:107
+#: src/main/escp2-resolutions.c:110
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:120
+#: src/main/escp2-resolutions.c:129
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
-#: src/main/escp2-resolutions.c:130
+#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
+#: src/main/escp2-resolutions.c:139
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
+#: src/main/escp2-resolutions.c:143 src/main/escp2-resolutions.c:146
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:140
+#: src/main/escp2-resolutions.c:149
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
+#: src/main/escp2-resolutions.c:153
+#, fuzzy
+msgid "5760 x 1440 DPI"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:157 src/main/escp2-resolutions.c:160
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
+#: src/main/escp2-resolutions.c:164 src/main/escp2-resolutions.c:167
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:449
+#: src/main/escp2-resolutions.c:480
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
-#: src/main/escp2-resolutions.c:480
+#: src/main/escp2-resolutions.c:488 src/main/escp2-resolutions.c:499
+#: src/main/escp2-resolutions.c:511
 msgid "Interleave"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
-#: src/main/escp2-resolutions.c:481
+#: src/main/escp2-resolutions.c:489 src/main/escp2-resolutions.c:500
+#: src/main/escp2-resolutions.c:512
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
-#: src/main/escp2-resolutions.c:482
+#: src/main/escp2-resolutions.c:490 src/main/escp2-resolutions.c:501
+#: src/main/escp2-resolutions.c:513
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
-#: src/main/escp2-resolutions.c:483
+#: src/main/escp2-resolutions.c:491 src/main/escp2-resolutions.c:502
+#: src/main/escp2-resolutions.c:514
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
+#: src/main/escp2-resolutions.c:503 src/main/escp2-resolutions.c:515
 msgid "Interleave 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:485
+#: src/main/escp2-resolutions.c:516
 msgid "Eight Pass"
 msgstr ""
 
@@ -2844,7 +2872,7 @@ msgstr "Canon S400"
 #: src/main/xmli18n-tmp.h:169
 #, fuzzy
 msgid "EPSON Stylus C20"
-msgstr "EPSON Stylus C20SX"
+msgstr "EPSON Stylus C20UX"
 
 #: src/main/xmli18n-tmp.h:170
 msgid "EPSON Stylus C20SX"
@@ -2857,7 +2885,7 @@ msgstr "EPSON Stylus C20UX"
 #: src/main/xmli18n-tmp.h:172
 #, fuzzy
 msgid "EPSON Stylus C40"
-msgstr "EPSON Stylus C40SX"
+msgstr "EPSON Stylus C40UX"
 
 #: src/main/xmli18n-tmp.h:173
 msgid "EPSON Stylus C40SX"
@@ -2870,7 +2898,7 @@ msgstr "EPSON Stylus C40UX"
 #: src/main/xmli18n-tmp.h:175
 #, fuzzy
 msgid "EPSON Stylus C41"
-msgstr "EPSON Stylus C41SX"
+msgstr "EPSON Stylus C41UX"
 
 #: src/main/xmli18n-tmp.h:176
 msgid "EPSON Stylus C41SX"
@@ -2883,7 +2911,7 @@ msgstr "EPSON Stylus C41UX"
 #: src/main/xmli18n-tmp.h:178
 #, fuzzy
 msgid "EPSON Stylus C42"
-msgstr "EPSON Stylus C42SX"
+msgstr "EPSON Stylus C42UX"
 
 #: src/main/xmli18n-tmp.h:179
 msgid "EPSON Stylus C42SX"
@@ -2896,7 +2924,7 @@ msgstr "EPSON Stylus C42UX"
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
 msgid "EPSON Stylus C43"
-msgstr "EPSON Stylus C43SX"
+msgstr "EPSON Stylus C43UX"
 
 #: src/main/xmli18n-tmp.h:182
 msgid "EPSON Stylus C43SX"
@@ -2909,7 +2937,7 @@ msgstr "EPSON Stylus C43UX"
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
 msgid "EPSON Stylus C44"
-msgstr "EPSON Stylus C44SX"
+msgstr "EPSON Stylus C44UX"
 
 #: src/main/xmli18n-tmp.h:185
 msgid "EPSON Stylus C44SX"
@@ -3390,632 +3418,685 @@ msgstr "EPSON Stylus CX3650"
 #: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "EPSON Stylus CX3700"
-msgstr "EPSON Stylus CX3100"
+msgstr "EPSON Stylus CX8300"
 
 #: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "EPSON Stylus CX3800"
-msgstr "EPSON Stylus CX3100"
+msgstr "EPSON Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:304
 #, fuzzy
+msgid "EPSON Stylus CX3805"
+msgstr "EPSON Stylus C85"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
 msgid "EPSON Stylus CX3810"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "EPSON Stylus CX4100"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:307
 #, fuzzy
 msgid "EPSON Stylus CX4200"
-msgstr "EPSON Stylus CX3200"
+msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4500"
+msgstr "EPSON Stylus CX8400"
+
+#: src/main/xmli18n-tmp.h:309
 msgid "EPSON Stylus CX4600"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX4700"
-msgstr "EPSON Stylus CX4600"
+msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX4800"
-msgstr "EPSON Stylus CX4600"
+msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:312
 msgid "EPSON Stylus CX5100"
 msgstr "EPSON Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:313
 msgid "EPSON Stylus CX5200"
 msgstr "EPSON Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:314
 msgid "EPSON Stylus CX5300"
 msgstr "EPSON Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:315
 msgid "EPSON Stylus CX5400"
 msgstr "EPSON Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "EPSON Stylus CX5700"
+msgstr "EPSON Stylus CX6500"
+
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX5800"
-msgstr "EPSON Stylus CX1500"
+msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:318
 msgid "EPSON Stylus CX6300"
 msgstr "EPSON Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:319
 msgid "EPSON Stylus CX6400"
 msgstr "EPSON Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:320
 msgid "EPSON Stylus CX6500"
 msgstr "EPSON Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:321
 msgid "EPSON Stylus CX6600"
 msgstr "EPSON Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "EPSON Stylus CX7700"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "EPSON Stylus CX7800"
-msgstr "EPSON Stylus CX8300"
+msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:324
 msgid "EPSON Stylus CX8300"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:325
 msgid "EPSON Stylus CX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:326
 #, fuzzy
 msgid "EPSON Stylus D68"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:327
 #, fuzzy
 msgid "EPSON Stylus D88"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "EPSON Stylus DX3800"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "EPSON Stylus DX3850"
 msgstr "EPSON Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "EPSON Stylus DX4200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:331
+#, fuzzy
+msgid "EPSON Stylus DX4250"
+msgstr "EPSON Stylus C50"
+
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "EPSON Stylus DX4800"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:333
+msgid "EPSON PictureMate"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:334
+msgid "EPSON PictureMate Deluxe"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON CL-700"
 msgstr "EPSON CL-700"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON CL-750"
 msgstr "EPSON CL-750"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON CL-760"
 msgstr "EPSON CL-760"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:338
+#, fuzzy
+msgid "EPSON E-100"
+msgstr "EPSON EM-900C"
+
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON EM-900C"
 msgstr "EPSON EM-900C"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON EM-930C"
 msgstr "EPSON EM-930C"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MC-2000"
 msgstr "EPSON MC-2000"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON MC-5000"
 msgstr "EPSON MC-5000"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON MC-7000"
 msgstr "EPSON MC-7000"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON MC-9000"
 msgstr "EPSON MC-9000"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON MC-10000"
 msgstr "EPSON MC-10000"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON MJ-930C"
 msgstr "EPSON MJ-930C"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON MJ-5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON MJ-6000C"
 msgstr "EPSON MJ-6000C"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON MJ-8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-700C"
 msgstr "EPSON PM-700C"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-730C"
 msgstr "EPSON PM-730C"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-740C"
 msgstr "EPSON PM-740C"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-750C"
 msgstr "EPSON PM-750C"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-760C"
 msgstr "EPSON PM-760C"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-770C"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-780C"
 msgstr "EPSON PM-780C"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-800C"
 msgstr "EPSON PM-800C"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-870C"
 msgstr "EPSON PM-870C"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-880C"
 msgstr "EPSON PM-880C"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-930C"
 msgstr "EPSON PM-930C"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-940C"
 msgstr "EPSON PM-940C"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-950C"
 msgstr "EPSON PM-950C"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-970C"
 msgstr "EPSON PM-970C"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-980C"
 msgstr "EPSON PM-980C"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PM-10000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:378
+#, fuzzy
+msgid "EPSON PM-A900"
+msgstr "EPSON PM-9000C"
+
+#: src/main/xmli18n-tmp.h:379
 msgid "EPSON PM-D750"
 msgstr "EPSON PM-D750"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:380
 msgid "EPSON PM-D770"
 msgstr "EPSON PM-D770"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:381
 msgid "EPSON PM-D1000"
 msgstr "EPSON PM-D1000"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PM-G700"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PM-G720"
 msgstr "EPSON PM-G720"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:384
 msgid "EPSON PM-G800"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:385
 msgid "EPSON PM-G820"
 msgstr "EPSON PM-G820"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:386
+#, fuzzy
+msgid "EPSON PX-A650"
+msgstr "EPSON PX-V600"
+
+#: src/main/xmli18n-tmp.h:387
 msgid "EPSON PX-G900"
 msgstr "EPSON PX-G900"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:388
 msgid "EPSON PX-G920"
 msgstr "EPSON PX-G920"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:389
 msgid "EPSON PX-G5000"
 msgstr "EPSON PX-G5000"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:390
 msgid "EPSON PX-V500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:391
 msgid "EPSON PX-V600"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:392
+#, fuzzy
+msgid "EPSON PX-5500"
+msgstr "EPSON PX-V500"
+
+#: src/main/xmli18n-tmp.h:393
 msgid "EPSON PX-7000"
 msgstr "EPSON PX-7000"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:394
 msgid "EPSON PX-9000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:395
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:396
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:397
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DeskJet 340"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DesignJet 2500C"
 msgstr "HP DesignJet 2500C"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DesignJet 3500C"
 msgstr "HP DesignJet 3500C"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 600/600C"
 msgstr "HP DeskJet 600/600C"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 600 series"
 msgstr "HP DeskJet 600 系列"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 690 series"
 msgstr "HP DeskJet 690 系列"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:426
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:427
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:428
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:429
 msgid "HP DeskJet 900 series"
 msgstr "HP DeskJet 900 系列"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:430
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:431
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:432
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:433
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:434
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:435
 msgid "HP DeskJet 2000 series"
 msgstr "HP DeskJet 2000 系列"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:436
 msgid "HP DeskJet 2500 series"
 msgstr "HP DeskJet 2500 系列"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:437
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:438
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:439
 msgid "HP LaserJet II series"
 msgstr "HP LaserJet II 系列"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:440
 msgid "HP LaserJet IIP series"
 msgstr "HP LaserJet IIP 系列"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:441
 msgid "HP LaserJet III series"
 msgstr "HP LaserJet III 系列"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:442
 msgid "HP LaserJet 4 series"
 msgstr "HP LaserJet 4 系列"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:443
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:444
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:445
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:446
 msgid "HP LaserJet 5 series"
 msgstr "HP LaserJet 5 系列"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:447
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:448
 msgid "HP LaserJet 6 series"
 msgstr "HP LaserJet 6 系列"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:449
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:450
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:451
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:452
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:453
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:454
 msgid "Olympus P10"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:455
 msgid "Olympus P200"
 msgstr "Olympus P200"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:456
 msgid "Olympus P300"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:457
 msgid "Olympus P400"
 msgstr "Olympus P400"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:458
 msgid "Olympus P440"
 msgstr "Olympus P440"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:459
 msgid "Canon CP100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:460
 msgid "Canon CP220"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:461
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:462
 #, fuzzy
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:463
 msgid "Fujifilm Printpix CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:464
 msgid "Fujifilm Printpix CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:465
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:466
 msgid "RAW DATA 8 bit"
 msgstr ""
 
@@ -4105,30 +4186,30 @@ msgstr ""
 msgid "Restore Previous"
 msgstr ""
 
-#: 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
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
+#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
+#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
 msgid "OK"
 msgstr "確定"
 
-#: 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
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
+#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
+#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
 msgid "Cancel"
 msgstr "�消"
 
-#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
+#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- 列�增效模組 %s 版本"
 
-#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
+#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
 msgid "About"
 msgstr "關於"
 
-#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
+#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4136,7 +4217,7 @@ msgstr ""
 "列�並\n"
 "儲存設定"
 
-#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
+#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
 msgid ""
 "Save\n"
 "Settings"
@@ -4144,15 +4225,15 @@ msgstr ""
 "儲存\n"
 "設定"
 
-#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
+#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
 msgid "Print"
 msgstr "列�"
 
-#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
+#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
 msgid "Preview"
 msgstr "�覽"
 
-#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
+#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4174,238 +4255,238 @@ msgstr ""
 "拖曳影�時按下 shift �，會�制影���水平或垂直方�移動。\n"
 "如果拖曳的時候�按多一個滑鼠按鈕，影�會還原至原來�置。"
 
-#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
+#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
 msgid "Paper Size"
 msgstr "紙張尺寸"
 
-#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
+#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
 msgid "Show All Paper Sizes"
 msgstr "顯示所有紙張尺寸"
 
-#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
+#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
 msgid "Dimensions:"
 msgstr "尺寸："
 
-#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
-#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2034
+#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
 msgid "Width:"
 msgstr "寬度："
 
-#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
+#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
 msgid "Width of the paper that you wish to print to"
 msgstr "列�時的紙張寬度"
 
-#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
-#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2036
+#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
 msgid "Height:"
 msgstr "高度："
 
-#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
+#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
 msgid "Height of the paper that you wish to print to"
 msgstr "列�時的紙張高度"
 
-#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
+#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
+#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
 msgid "Number of Copies"
 msgstr "份數"
 
-#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr "請�擇列�多少份 (1-100 之間)"
 
-#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
+#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
 msgid "Image Position"
 msgstr "影��置"
 
-#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
+#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
 msgid "Auto"
 msgstr "自動"
 
-#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
+#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
 msgid "Portrait"
 msgstr "直�"
 
-#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
+#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
 msgid "Landscape"
 msgstr "橫�"
 
-#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
+#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
 msgid "Upside down"
 msgstr "直�倒置"
 
-#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
+#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
 msgid "Seascape"
 msgstr "橫�倒置"
 
-#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr "指定列�時的方�：直��橫��直�倒置�橫�倒置"
 
-#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
 msgid "Orientation:"
 msgstr "方�："
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
 msgid "Left:"
 msgstr "左："
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
 msgid "Distance from the left of the paper to the image"
 msgstr "從紙張左邊邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
-#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
 msgid "Right:"
 msgstr "�："
 
-#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "從紙張左邊邊緣至影��邊邊緣之間的�離"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
 msgid "Distance from the right of the paper to the image"
 msgstr "從紙張�邊邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
+#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
 msgid "Top:"
 msgstr "上："
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the top of the paper to the image"
 msgstr "從紙張頂部邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
+#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
+#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
 msgid "Bottom:"
 msgstr "下："
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "從紙張頂部邊緣至影�底部邊緣之間的�離"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
 msgid "Distance from the bottom of the paper to the image"
 msgstr "從紙張底部邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
 msgid "Center:"
 msgstr "置中："
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Horizontal"
 msgstr "æ°´å¹³"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
 msgid "Center the image horizontally on the paper"
 msgstr "將影�的水平�置調整至紙張中間"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Both"
 msgstr "兩者"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image on the paper"
 msgstr "將影�放置在紙張中間"
 
-#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Vertical"
 msgstr "åž‚ç›´"
 
-#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image vertically on the paper"
 msgstr "將影�的垂直�置調整至紙張中間"
 
-#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
+#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
 msgid "Setup Printer"
 msgstr "設定�表機"
 
-#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
 msgid "Printer Make:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
+#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
 msgid "Select the make of your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
-#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
+#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
+#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
 msgid "Printer Model:"
 msgstr "�表機型號："
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
+#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
 msgid "Select your printer model"
 msgstr "請���表機型號"
 
-#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
+#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
 msgid "PPD File:"
 msgstr "PPD 檔："
 
-#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
+#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
 msgid "Enter the correct PPD filename for your printer"
 msgstr "請輸入��您的�表機使用的 PPD 檔案�稱"
 
-#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
-#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
+#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
+#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
 msgid "Browse"
 msgstr "�覽"
 
-#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
+#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
 msgid "Choose the correct PPD filename for your printer"
 msgstr "請�擇��您的�表機使用的 PPD 檔案�稱"
 
-#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
+#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
 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:1682 src/gutenprintui2/panel.c:1681
+#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
 msgid "Printer Queue:"
 msgstr "�表機佇列："
 
-#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid "Enter the correct command to print to your printer. "
 msgstr "請輸入列�所使用的指令。"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
+#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
 msgid "Enter the file to print to. "
 msgstr "請輸入列�時寫入的檔案。"
 
-#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
+#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
+#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
 msgid "Print To File"
 msgstr "列�至檔案"
 
-#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
+#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
 msgid "Define New Printer"
 msgstr "定義新的�表機"
 
-#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
+#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
 msgid "Printer Name:"
 msgstr "�表機�稱："
 
-#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
+#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
 msgid "Enter the name you wish to give this logical printer"
 msgstr "為這個虛擬�表機命�"
 
-#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
+#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
 msgid "About Gutenprint "
 msgstr "關於 Gutenprint "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 msgid "Gutenprint Version "
 msgstr "Gutenprint 版本 "
 
-#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
+#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
 #, fuzzy
 msgid ""
 "\n"
@@ -4444,83 +4525,83 @@ msgstr ""
 "您應已收到附隨於本程�的GNU通用公共授權的副本；如無，請寫信至自由軟體基金會："
 "59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n"
 
-#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
+#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
 msgid "Printer Settings"
 msgstr "�表機設定"
 
-#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
+#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
 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:1873 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1883
 msgid "Setup Printer..."
 msgstr "設定�表機..."
 
-#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
+#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1885
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr "��列�時使用的�表機型號�PPD 檔�指令"
 
-#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
+#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1898
 msgid "New Printer..."
 msgstr "新增�表機..."
 
-#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
+#: src/gutenprintui/panel.c:1900 src/gutenprintui2/panel.c:1899
 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:1932 src/gutenprintui2/panel.c:1930
+#: src/gutenprintui/panel.c:1943 src/gutenprintui2/panel.c:1942
 msgid "Image Size"
 msgstr "影�尺寸"
 
-#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
+#: src/gutenprintui/panel.c:1968 src/gutenprintui2/panel.c:1967
 msgid "Scaling:"
 msgstr "縮放："
 
-#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
+#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1971
 msgid "Set the scale (size) of the image"
 msgstr "指定影�的縮放比例 (尺寸)"
 
-#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
+#: src/gutenprintui/panel.c:1994 src/gutenprintui2/panel.c:1993
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1999 src/gutenprintui2/panel.c:1998
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr "指定放大縮�影�時的單�，是��尺寸的百分比，還是�英�有多少點"
 
-#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
+#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2001
 msgid "Percent"
 msgstr "百分比"
 
-#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
+#: src/gutenprintui/panel.c:2007 src/gutenprintui2/panel.c:2006
 msgid "Scale the print to the size of the page"
 msgstr "指定列�時的影�尺寸為��尺寸的�個百分比"
 
-#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2010
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2015
 msgid "Scale the print to the number of dots per inch"
 msgstr "列�時，��指定�英�有多少點來放大縮�影�"
 
-#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
+#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2033
 msgid "Set the width of the print"
 msgstr "指定列�時的影�寬度"
 
-#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
+#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2035
 msgid "Set the height of the print"
 msgstr "指定列�時的影�高度"
 
-#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
+#: src/gutenprintui/panel.c:2042 src/gutenprintui2/panel.c:2041
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4528,64 +4609,64 @@ msgstr ""
 "使用影�\n"
 "原來的尺寸"
 
-#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2048 src/gutenprintui2/panel.c:2047
 msgid "Set the print size to the size of the image"
 msgstr "將列�時的影�尺寸設定為影�原來的尺寸"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071
 msgid "Print Color Adjust"
 msgstr "列�色彩調整"
 
-#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
+#: src/gutenprintui/panel.c:2074 src/gutenprintui2/panel.c:2074
 msgid "Set Defaults"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
+#: src/gutenprintui/panel.c:2076 src/gutenprintui2/panel.c:2076
 msgid "Close"
 msgstr "關閉"
 
-#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
+#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2105
 msgid "Image preview"
 msgstr "影��覽"
 
-#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2119
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
+#: src/gutenprintui/panel.c:2205 src/gutenprintui2/panel.c:2210
 msgid "Output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
+#: src/gutenprintui/panel.c:2233 src/gutenprintui2/panel.c:2238
 msgid "Output Type:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
+#: src/gutenprintui/panel.c:2237 src/gutenprintui2/panel.c:2242
 msgid "Select the desired output type"
 msgstr "指定輸出類型："
 
-#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
+#: src/gutenprintui/panel.c:2258 src/gutenprintui2/panel.c:2263
 msgid "Adjust Output..."
 msgstr "調整輸出�果..."
 
-#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
+#: src/gutenprintui/panel.c:2267 src/gutenprintui2/panel.c:2272
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr "調整色彩平衡�光度��差�彩度�擬色的�算方�"
 
-#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
+#: src/gutenprintui/panel.c:2285 src/gutenprintui2/panel.c:2291
 msgid "Size Units:"
 msgstr "尺寸單�："
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2288 src/gutenprintui2/panel.c:2294
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
+#: src/gutenprintui/panel.c:2312 src/gutenprintui2/panel.c:2318
 msgid "Units:"
 msgstr "單�："
 
-#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
+#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2323
 msgid "Select the base unit of measurement for printing"
 msgstr "指定列�時的基本長度單�"
 
@@ -4715,15 +4796,15 @@ msgstr ""
 msgid "ISOLatin1"
 msgstr ""
 
-#: src/cups/genppd.c:1417
+#: src/cups/genppd.c:1424
 msgid "No"
 msgstr "�"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1426
 msgid "Yes"
 msgstr "是"
 
-#: src/cups/genppd.c:1447
+#: src/cups/genppd.c:1454
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -4897,18 +4978,19 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "無法由 %s 讀�資料：%s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:943
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1040
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:1230
 #, c-format
 msgid ""
 "\n"
@@ -4917,7 +4999,8 @@ msgstr ""
 "\n"
 "無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1026
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid ""
 "\n"
@@ -4932,82 +5015,82 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
-#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:871
+#: src/escputil/escputil.c:872 src/escputil/escputil.c:888
+#: src/escputil/escputil.c:889 src/escputil/escputil.c:890
+#: src/escputil/escputil.c:891 src/escputil/escputil.c:892
+#: src/escputil/escputil.c:895 src/escputil/escputil.c:896
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:898
+#: src/escputil/escputil.c:899 src/escputil/escputil.c:990
 msgid "Unknown"
 msgstr "�詳"
 
-#: src/escputil/escputil.c:900
+#: src/escputil/escputil.c:919
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:903
+#: src/escputil/escputil.c:922
 msgid "status"
 msgstr "狀態"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr ""
-
-#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
-#, c-format
-msgid "Cannot identify printer!\n"
-msgstr "無法識別�表機�\n"
-
 #: src/escputil/escputil.c:927
 #, c-format
-msgid "Printer does not support listing ink types!\n"
+msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Ink color"
 msgstr "墨水�色"
 
-#: 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
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1084
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:1131
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Printer does not support listing ink types!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
-#: src/escputil/escputil.c:1236
+#: src/escputil/escputil.c:1288 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1332
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
-#: src/escputil/escputil.c:1237
+#: src/escputil/escputil.c:1289 src/escputil/escputil.c:1313
+#: src/escputil/escputil.c:1333
 msgid "Date"
 msgstr "日期"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1371
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1289
+#: src/escputil/escputil.c:1389
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "無法識別�表機型號。\n"
 
-#: src/escputil/escputil.c:1308
+#: src/escputil/escputil.c:1408
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1319
+#: src/escputil/escputil.c:1419
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1423
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5046,7 +5129,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1358
+#: src/escputil/escputil.c:1458
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5082,12 +5165,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1502
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1412
+#: src/escputil/escputil.c:1512
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5099,38 +5182,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: 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
+#: src/escputil/escputil.c:1520 src/escputil/escputil.c:1527
+#: src/escputil/escputil.c:1540 src/escputil/escputil.c:1556
+#: src/escputil/escputil.c:1658
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1425
+#: src/escputil/escputil.c:1525
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1530
 #, 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:1437
+#: src/escputil/escputil.c:1537
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1443
+#: src/escputil/escputil.c:1543
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1549
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5140,44 +5223,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1459
+#: src/escputil/escputil.c:1559
 #, c-format
 msgid "About to save settings..."
 msgstr "準備儲存設定..."
 
-#: src/escputil/escputil.c:1465
+#: src/escputil/escputil.c:1565
 #, c-format
 msgid "failed!\n"
 msgstr "失敗�\n"
 
-#: src/escputil/escputil.c:1466
+#: src/escputil/escputil.c:1566
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1470
+#: src/escputil/escputil.c:1570
 #, c-format
 msgid "succeeded!\n"
 msgstr "�功�\n"
 
-#: src/escputil/escputil.c:1471
+#: src/escputil/escputil.c:1571
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1476
+#: src/escputil/escputil.c:1576
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1479
+#: src/escputil/escputil.c:1579
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1484
+#: src/escputil/escputil.c:1584
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5188,12 +5271,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
-#: src/escputil/escputil.c:1609
+#: src/escputil/escputil.c:1644 src/escputil/escputil.c:1666
+#: src/escputil/escputil.c:1709
 msgid "Press enter to continue > "
 msgstr "請按 enter 繼續 > "
 
-#: src/escputil/escputil.c:1551
+#: src/escputil/escputil.c:1651
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5201,42 +5284,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1557
+#: src/escputil/escputil.c:1657
 #, c-format
 msgid "Pass #%d"
 msgstr "第 %d 次"
 
-#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
+#: src/escputil/escputil.c:1663 src/escputil/escputil.c:1708
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "請放入白紙。\n"
 
-#: src/escputil/escputil.c:1582
+#: src/escputil/escputil.c:1682
 #, c-format
 msgid "Number out of range!\n"
 msgstr "數字超出範�以外�\n"
 
-#: src/escputil/escputil.c:1587
+#: src/escputil/escputil.c:1687
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1593
+#: src/escputil/escputil.c:1693
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1600
+#: src/escputil/escputil.c:1700
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:1603
+#: src/escputil/escputil.c:1703
 #, c-format
 msgid "succeeded.\n"
 msgstr "�功。\n"
 
-#: src/escputil/escputil.c:1604
+#: src/escputil/escputil.c:1704
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5245,7 +5328,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1650
+#: src/escputil/escputil.c:1750
 #, c-format
 msgid "Error in input\n"
 msgstr ""
@@ -5381,6 +5464,9 @@ msgstr ""
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
+#~ msgid "Cannot identify printer!\n"
+#~ msgstr "無法識別�表機�\n"
+
 #~ msgid "Red Balance"
 #~ msgstr "紅色平衡"
 
diff --git a/samples/Makefile.in b/samples/Makefile.in
index 5e8f1af..fe732ef 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -281,10 +281,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 9c9e1b9..ee4e868 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -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 install-sh ltmain.sh missing \
+	config.rpath config.sub depcomp install-sh ltmain.sh missing \
 	mkinstalldirs
 subdir = scripts
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -273,10 +273,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/scripts/depcomp b/scripts/depcomp
new file mode 100755
index 0000000..ffcd540
--- /dev/null
+++ b/scripts/depcomp
@@ -0,0 +1,529 @@
+#! /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/ltmain.sh b/scripts/ltmain.sh
index db4982d..8fc56db 100644
--- a/scripts/ltmain.sh
+++ b/scripts/ltmain.sh
@@ -43,8 +43,8 @@ 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)"
+VERSION="1.5.22 Debian 1.5.22-2"
+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
 # commands through without removal of \ escapes.
@@ -132,6 +132,8 @@ run=
 show="$echo"
 show_help=
 execute_dlfiles=
+duplicate_deps=no
+preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 
@@ -139,6 +141,43 @@ o2lo="s/\\.${objext}\$/.lo/"
 # Shell function definitions:
 # This seems to be the best place for them
 
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+	# Failing that, at least try and use $RANDOM to avoid a race
+	my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+	save_mktempdir_umask=`umask`
+	umask 0077
+	$mkdir "$my_tmpdir"
+	umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || {
+        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+	exit $EXIT_FAILURE
+      }
+    fi
+
+    $echo "X$my_tmpdir" | $Xsed
+}
+
+
 # func_win32_libid arg
 # return the library type of file 'arg'
 #
@@ -157,12 +196,11 @@ func_win32_libid ()
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $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
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
+	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
     fi
     ;;
   *DLL*)
@@ -295,9 +333,9 @@ func_extract_archives ()
       $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
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
+	exit $exit_status
       fi
       case $host in
       *-darwin*)
@@ -352,6 +390,8 @@ func_extract_archives ()
 # Darwin sucks
 eval std_shrext=\"$shrext_cmds\"
 
+disable_libs=no
+
 # Parse our command line options once, thoroughly.
 while test "$#" -gt 0
 do
@@ -468,7 +508,11 @@ do
     preserve_args="$preserve_args $arg"
     ;;
 
-  --tag) prevopt="--tag" prev=tag ;;
+  --tag)
+    prevopt="--tag"
+    prev=tag
+    preserve_args="$preserve_args --tag"
+    ;;
   --tag=*)
     set tag "$optarg" ${1+"$@"}
     shift
@@ -500,6 +544,18 @@ if test -n "$prevopt"; then
   exit $EXIT_FAILURE
 fi
 
+case $disable_libs in
+no) 
+  ;;
+shared)
+  build_libtool_libs=no
+  build_old_libs=yes
+  ;;
+static)
+  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+  ;;
+esac
+
 # If this variable is set in any of the actions, the command in it
 # will be execed at the end.  This prevents here-documents from being
 # left over by shells.
@@ -856,9 +912,9 @@ EOF
       if test ! -d "${xdir}$objdir"; then
 	$show "$mkdir ${xdir}$objdir"
 	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
+	exit_status=$?
+	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
+	  exit $exit_status
 	fi
       fi
 
@@ -1061,6 +1117,7 @@ EOF
     no_install=no
     objs=
     non_pic_objects=
+    notinst_path= # paths that contain not-installed libtool libraries
     precious_files_regex=
     prefer_static_libs=no
     preload=no
@@ -1089,14 +1146,15 @@ EOF
 	  if test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
+	  prefer_static_libs=yes
 	else
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
+	  prefer_static_libs=built
 	fi
 	build_libtool_libs=no
 	build_old_libs=yes
-	prefer_static_libs=yes
 	break
 	;;
       esac
@@ -1271,6 +1329,11 @@ EOF
 		  if test -z "$pic_object" || test "$pic_object" = none ; then
 		    arg="$non_pic_object"
 		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
 		fi
 	      else
 		# Only an error if not doing a dry-run.
@@ -1354,8 +1417,8 @@ EOF
 	  prev=
 	  continue
 	  ;;
-        darwin_framework)
-	  compiler_flags="$compiler_flags $arg"
+	darwin_framework|darwin_framework_skip)
+	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
 	  compile_command="$compile_command $arg"
 	  finalize_command="$finalize_command $arg"
 	  prev=
@@ -1419,13 +1482,17 @@ EOF
 	continue
 	;;
 
-      -framework|-arch)
-        prev=darwin_framework
-        compiler_flags="$compiler_flags $arg"
+      -framework|-arch|-isysroot)
+	case " $CC " in
+	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
+		prev=darwin_framework_skip ;;
+	  *) compiler_flags="$compiler_flags $arg"
+	     prev=darwin_framework ;;
+	esac
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
-        continue
-        ;;
+	continue
+	;;
 
       -inst-prefix-dir)
 	prev=inst_prefix
@@ -1453,7 +1520,8 @@ EOF
 	  absdir=`cd "$dir" && pwd`
 	  if test -z "$absdir"; then
 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit $EXIT_FAILURE
+	    absdir="$dir"
+	    notinst_path="$notinst_path $dir"
 	  fi
 	  dir="$absdir"
 	  ;;
@@ -1467,10 +1535,15 @@ EOF
 	esac
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  *) dllsearchpath="$dllsearchpath:$dir";;
 	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
 	  ;;
 	esac
 	continue
@@ -1479,11 +1552,11 @@ EOF
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
-	  *-*-mingw* | *-*-os2*)
+	  *-*-os2*)
 	    # These systems don't actually have a C library (as such)
 	    test "X$arg" = "X-lc" && continue
 	    ;;
@@ -1495,6 +1568,15 @@ EOF
 	    # Rhapsody C and math libraries are in the System framework
 	    deplibs="$deplibs -framework System"
 	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
 	  esac
 	elif test "X$arg" = "X-lc_r"; then
 	 case $host in
@@ -1536,7 +1618,12 @@ EOF
       # +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*)
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -pg pass through profiling flag for GCC
+      # @file GCC response files
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+      -t[45]*|-txscale*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1548,9 +1635,7 @@ EOF
 	esac
         compile_command="$compile_command $arg"
         finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
+        compiler_flags="$compiler_flags $arg"
         continue
         ;;
 
@@ -1788,6 +1873,11 @@ EOF
 	    if test -z "$pic_object" || test "$pic_object" = none ; then
 	      arg="$non_pic_object"
 	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
 	  fi
 	else
 	  # Only an error if not doing a dry-run.
@@ -1893,9 +1983,9 @@ EOF
     if test ! -d "$output_objdir"; then
       $show "$mkdir $output_objdir"
       $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
+	exit $exit_status
       fi
     fi
 
@@ -1958,7 +2048,6 @@ EOF
     newlib_search_path=
     need_relink=no # whether we're linking any uninstalled libtool libraries
     notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
     case $linkmode in
     lib)
 	passes="conv link"
@@ -2197,7 +2286,7 @@ EOF
 	esac # case $deplib
 	if test "$found" = yes || test -f "$lib"; then :
 	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
 	  exit $EXIT_FAILURE
 	fi
 
@@ -2448,8 +2537,12 @@ EOF
 	fi
 
 	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes ; then
+	  use_static_libs=no
+	fi
 	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
 	  if test "$installed" = no; then
 	    notinst_deplibs="$notinst_deplibs $lib"
 	    need_relink=yes
@@ -2562,11 +2655,15 @@ EOF
 	      if test "$hardcode_direct" = no; then
 		add="$dir/$linklib"
 		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) 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 | $EGREP "bundle" >/dev/null ; then
+		    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
@@ -3322,9 +3419,9 @@ EOF
 
       # Eliminate all temporary directories.
       for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
       done
 
       if test -n "$xrpath"; then
@@ -3377,7 +3474,12 @@ EOF
 	    ;;
 	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
 	    ;;
  	  *)
 	    # Add libc to deplibs on all other systems if necessary.
@@ -3421,7 +3523,7 @@ EOF
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
+	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
 	  if test "$?" -eq 0 ; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
@@ -3466,7 +3568,7 @@ EOF
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC -o conftest conftest.c $i
+		$LTCC $LTCFLAGS -o conftest conftest.c $i
 		# Did it work?
 		if test "$?" -eq 0 ; then
 		  ldd_output=`ldd conftest`
@@ -3713,6 +3815,35 @@ EOF
 	deplibs=$newdeplibs
       fi
 
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+
       # All the library-specific variables (install_libdir is set above).
       library_names=
       old_library=
@@ -3796,6 +3927,7 @@ EOF
 	fi
 
 	lib="$output_objdir/$realname"
+	linknames=
 	for link
 	do
 	  linknames="$linknames $link"
@@ -4227,6 +4359,35 @@ EOF
         ;;
       esac
 
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
       compile_command="$compile_command $compile_deplibs"
       finalize_command="$finalize_command $finalize_deplibs"
 
@@ -4271,10 +4432,15 @@ EOF
 	fi
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  *) dllsearchpath="$dllsearchpath:$libdir";;
 	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
 	  ;;
 	esac
       done
@@ -4391,10 +4557,22 @@ extern \"C\" {
 	      export_symbols="$output_objdir/$outputname.exp"
 	      $run $rm $export_symbols
 	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+              case $host in
+              *cygwin* | *mingw* )
+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
 	    else
-	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      $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"'
+              case $host in
+              *cygwin* | *mingw* )
+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
 	    fi
 	  fi
 
@@ -4511,16 +4689,29 @@ static const void *lt_preloaded_setup() {
 	  esac
 
 	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
 
 	  # Clean up the generated files.
 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
 	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
 
 	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+          case $host in
+          *cygwin* | *mingw* )
+            if test -f "$output_objdir/${outputname}.def" ; then
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+            else
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+             fi
+            ;;
+          * )
+            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            ;;
+          esac
 	  ;;
 	*)
 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@ -4545,7 +4736,7 @@ static const void *lt_preloaded_setup() {
 	# We have no uninstalled library dependencies, so finalize right now.
 	$show "$link_command"
 	$run eval "$link_command"
-	status=$?
+	exit_status=$?
 
 	# Delete the generated files.
 	if test -n "$dlsyms"; then
@@ -4553,7 +4744,7 @@ static const void *lt_preloaded_setup() {
 	  $run $rm "$output_objdir/${outputname}S.${objext}"
 	fi
 
-	exit $status
+	exit $exit_status
       fi
 
       if test -n "$shlibpath_var"; then
@@ -4693,10 +4884,12 @@ static const void *lt_preloaded_setup() {
 	esac
 	case $host in
 	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+            output_name=`basename $output`
+            output_path=`dirname $output`
+            cwrappersource="$output_path/$objdir/lt-$output_name.c"
+            cwrapper="$output_path/$output_name.exe"
+            $rm $cwrappersource $cwrapper
+            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
 	    cat > $cwrappersource <<EOF
 
@@ -4721,6 +4914,9 @@ EOF
 #include <malloc.h>
 #include <stdarg.h>
 #include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
 
 #if defined(PATH_MAX)
 # define LT_PATHMAX PATH_MAX
@@ -4731,15 +4927,19 @@ EOF
 #endif
 
 #ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
 #endif
 
 #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
   defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
 #endif
 
 #ifndef DIR_SEPARATOR_2
@@ -4749,17 +4949,32 @@ EOF
         (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
 #endif /* DIR_SEPARATOR_2 */
 
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
 #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
   if (stale) { free ((void *) stale); stale = 0; } \
 } while (0)
 
+/* -DDEBUG is fairly common in CFLAGS.  */
+#undef DEBUG
+#if defined DEBUGWRAPPER
+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
+#else
+# define DEBUG(format, ...)
+#endif
+
 const char *program_name = NULL;
 
 void * xmalloc (size_t num);
 char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
+const char * base_name (const char *name);
+char * find_executable(const char *wrapper);
+int    check_executable(const char *path);
 char * strendzap(char *str, const char *pat);
 void lt_fatal (const char *message, ...);
 
@@ -4769,29 +4984,50 @@ main (int argc, char *argv[])
   char **newargz;
   int i;
 
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  DEBUG("(main) argv[0]      : %s\n",argv[0]);
+  DEBUG("(main) program_name : %s\n",program_name);
   newargz = XMALLOC(char *, argc+2);
 EOF
 
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
+            cat >> $cwrappersource <<EOF
+  newargz[0] = (char *) xstrdup("$SHELL");
 EOF
 
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
+            cat >> $cwrappersource <<"EOF"
+  newargz[1] = find_executable(argv[0]);
+  if (newargz[1] == NULL)
+    lt_fatal("Couldn't find %s", argv[0]);
+  DEBUG("(main) found exe at : %s\n",newargz[1]);
   /* 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");
   for (i = 1; i < argc; i++)
     newargz[i+1] = xstrdup(argv[i]);
   newargz[argc+1] = NULL;
+
+  for (i=0; i<argc+1; i++)
+  {
+    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
+    ;
+  }
+
 EOF
 
-	    cat >> $cwrappersource <<EOF
+            case $host_os in
+              mingw*)
+                cat >> $cwrappersource <<EOF
+  execv("$SHELL",(char const **)newargz);
+EOF
+              ;;
+              *)
+                cat >> $cwrappersource <<EOF
   execv("$SHELL",newargz);
 EOF
+              ;;
+            esac
 
-	    cat >> $cwrappersource <<"EOF"
+            cat >> $cwrappersource <<"EOF"
   return 127;
 }
 
@@ -4812,48 +5048,148 @@ xstrdup (const char *string)
 ;
 }
 
-char *
-basename (const char *name)
+const char *
+base_name (const char *name)
 {
   const char *base;
 
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
   /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':')
+  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
     name += 2;
 #endif
 
   for (base = name; *name; name++)
     if (IS_DIR_SEPARATOR (*name))
       base = name + 1;
-  return (char *) base;
+  return base;
+}
+
+int
+check_executable(const char * path)
+{
+  struct stat st;
+
+  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0) &&
+      (
+        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
+#if defined (S_IXOTH)
+       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
+#endif
+#if defined (S_IXGRP)
+       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
+#endif
+       ((st.st_mode & S_IXUSR) == S_IXUSR))
+      )
+    return 1;
+  else
+    return 0;
 }
 
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise */
 char *
-fnqualify(const char *path)
+find_executable (const char* wrapper)
 {
-  size_t size;
-  char *p;
+  int has_slash = 0;
+  const char* p;
+  const char* p_next;
+  /* static buffer for getcwd */
   char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char* concat_name;
 
-  assert(path != NULL);
+  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
 
-  /* Is it qualified already? */
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
+  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
+  {
+    concat_name = xstrdup (wrapper);
+    if (check_executable(concat_name))
+      return concat_name;
+    XFREE(concat_name);
+  }
+  else
+  {
+#endif
+    if (IS_DIR_SEPARATOR (wrapper[0]))
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable(concat_name))
+        return concat_name;
+      XFREE(concat_name);
+    }
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  }
 #endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
 
-  /* prepend the current directory */
-  /* doesn't handle '~' */
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+    {
+      has_slash = 1;
+      break;
+    }
+  if (!has_slash)
+  {
+    /* no slashes; search PATH */
+    const char* path = getenv ("PATH");
+    if (path != NULL)
+    {
+      for (p = path; *p; p = p_next)
+      {
+        const char* q;
+        size_t p_len;
+        for (q = p; *q; q++)
+          if (IS_PATH_SEPARATOR(*q))
+            break;
+        p_len = q - p;
+        p_next = (*q == '\0' ? q : q + 1);
+        if (p_len == 0)
+        {
+          /* empty path: current directory */
+          if (getcwd (tmp, LT_PATHMAX) == NULL)
+            lt_fatal ("getcwd failed");
+          tmp_len = strlen(tmp);
+          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, tmp, tmp_len);
+          concat_name[tmp_len] = '/';
+          strcpy (concat_name + tmp_len + 1, wrapper);
+        }
+        else
+        {
+          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, p, p_len);
+          concat_name[p_len] = '/';
+          strcpy (concat_name + p_len + 1, wrapper);
+        }
+        if (check_executable(concat_name))
+          return concat_name;
+        XFREE(concat_name);
+      }
+    }
+    /* not found in PATH; assume curdir */
+  }
+  /* Relative path | not found in path: prepend cwd */
   if (getcwd (tmp, LT_PATHMAX) == NULL)
     lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
+  tmp_len = strlen(tmp);
+  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable(concat_name))
+    return concat_name;
+  XFREE(concat_name);
+  return NULL;
 }
 
 char *
@@ -4897,16 +5233,16 @@ lt_fatal (const char *message, ...)
   va_end (ap);
 }
 EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+          # we should really use a build-platform specific compiler
+          # here, but OTOH, the wrappers (shell script and this C one)
+          # are only useful if you want to execute the "real" binary.
+          # Since the "real" binary is built for $host, then this
+          # wrapper might as well be built for $host, too.
+          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
+          ;;
+        esac
+        $rm $output
+        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
 
 	$echo > $output "\
 #! $SHELL
@@ -5136,9 +5472,9 @@ fi\
 	    $run ${rm}r "$gentop"
 	    $show "$mkdir $gentop"
 	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
+	    exit_status=$?
+	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
+	      exit $exit_status
 	    fi
 	  fi
 
@@ -5805,18 +6141,7 @@ relink_command=\"$relink_command\""
 	  outputname=
 	  if test "$fast_install" = no && test -n "$relink_command"; then
 	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      save_umask=`umask`
-	      umask 0077
-	      if $mkdir "$tmpdir"; then
-	        umask $save_umask
-	      else
-	        umask $save_umask
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
+	      tmpdir=`func_mktempdir`
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
@@ -5940,7 +6265,7 @@ relink_command=\"$relink_command\""
     # Exit here if they wanted silent mode.
     test "$show" = : && exit $EXIT_SUCCESS
 
-    $echo "----------------------------------------------------------------------"
+    $echo "X----------------------------------------------------------------------" | $Xsed
     $echo "Libraries have been installed in:"
     for libdir in $libdirs; do
       $echo "   $libdir"
@@ -5973,7 +6298,7 @@ relink_command=\"$relink_command\""
     $echo
     $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 "----------------------------------------------------------------------"
+    $echo "X----------------------------------------------------------------------" | $Xsed
     exit $EXIT_SUCCESS
     ;;
 
@@ -6190,9 +6515,17 @@ relink_command=\"$relink_command\""
 	    rmfiles="$rmfiles $objdir/$n"
 	  done
 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
 
-	  if test "$mode" = uninstall; then
+	  case "$mode" in
+	  clean)
+	    case "  $library_names " in
+	    # "  " in the beginning catches empty $dlname
+	    *" $dlname "*) ;;
+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    esac
+	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    ;;
+	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
 	      cmds=$postuninstall_cmds
@@ -6225,7 +6558,8 @@ relink_command=\"$relink_command\""
 	      IFS="$save_ifs"
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
-	  fi
+	    ;;
+	  esac
 	fi
 	;;
 
@@ -6524,12 +6858,11 @@ exit $?
 # configuration.  But we'll never go from static-only to shared-only.
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
+disable_libs=shared
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+disable_libs=static
 # ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
diff --git a/src/Makefile.in b/src/Makefile.in
index 63a4960..3d4243a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -280,10 +280,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index f506b11..9f1ccf9 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -351,10 +351,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index 94e9085..1b90140 100644
--- a/src/cups/cups-genppdupdate.in
+++ b/src/cups/cups-genppdupdate.in
@@ -1,5 +1,5 @@
 #! @PERL@ -w
-# $Id: cups-genppdupdate.in,v 1.21 2005/08/14 10:07:36 rleigh Exp $
+# $Id: cups-genppdupdate.in,v 1.22 2005/12/24 22:41:11 rlk Exp $
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
 #
@@ -173,6 +173,7 @@ sub update_ppd ($) {
 
     open ORIG, $_ or die "$_: can't open PPD file: $!";
     seek (ORIG, 0, 0) or die "can't seek to start of PPD file";
+    my @orig_metadata = stat(ORIG);
     if ($debug) {
 	print "Source Filename: $ppd_source_filename\n";
     }
@@ -277,8 +278,6 @@ sub update_ppd ($) {
     # Save new PPD in a temporary file, for processing...
 
     my($tmpfile, $tmpfilename) = tmpnam();
-    chown(0, 0, $tmpfilename); # root.root
-    chmod(0644, $tmpfilename);
     unlink $tmpfilename or warn "can't unlink temporary file $tmpfile: $!\n";
     print $tmpfile $source_data;
 
@@ -366,8 +365,6 @@ default_loop:
 	warn "Can't open $tmpnew for writing: $!\n";
 	return 0;
     }
-    chown(0, 0, $tmpnew);	# Bad idea to hardcode this...
-    chmod(0644, $tmpnew);	# Bad idea to hardcode this...
     print NEWPPD $source_data;
     if (! close NEWPPD) {
 	warn "Can't close ${tmpnew}.new for writing: $!\n";
@@ -380,6 +377,8 @@ default_loop:
 	unlink $tmpnew;
 	return 0;
     }
+    chown($orig_metadata[4], $orig_metadata[5], $ppd_source_filename);
+    chmod(($orig_metadata[2] & 0777), $ppd_source_filename);
 
     if (!$quiet || $verbose) {
 	print STDOUT "Updated $ppd_source_filename using $source\n";
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index c39d768..bdff9fe 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: genppd.c,v 1.109 2005/10/18 02:08:16 rlk Exp $"
+ * "$Id: genppd.c,v 1.113 2005/12/31 21:27:29 rlk Exp $"
  *
  *   PPD file generation program for the CUPS drivers.
  *
@@ -1234,10 +1234,17 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 	  stp_set_string_parameter(v, "Quality", opt->name);
 	  stp_describe_resolution(v, &xdpi, &ydpi);
 	  if (xdpi == -1 || ydpi == -1)
-	    gzprintf(fp, "*StpQuality %s/%s: \"\"\n", opt->name, opt->text);
-	  else
-	    gzprintf(fp, "*StpQuality %s/%s:\t\"<</HWResolution[%d %d]>>setpagedevice\"\n",
-		     opt->name, opt->text, xdpi, ydpi);
+	    {
+	      stp_parameter_t res_desc;
+	      stp_clear_string_parameter(v, "Quality");
+	      stp_describe_parameter(v, "Resolution", &res_desc);
+	      stp_set_string_parameter(v, "Resolution", res_desc.deflt.str);
+	      stp_describe_resolution(v, &xdpi, &ydpi);
+	      stp_clear_string_parameter(v, "Resolution");
+	      stp_parameter_description_destroy(&res_desc);
+	    }
+	  gzprintf(fp, "*StpQuality %s/%s:\t\"<</HWResolution[%d %d]/cupsRowFeed %d>>setpagedevice\"\n",
+		   opt->name, opt->text, xdpi, ydpi, i + 1);
 	}
       gzputs(fp, "*CloseUI: *StpQuality\n\n");
     }
@@ -1300,7 +1307,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
     */
 
     gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]/cupsCompression %d>>setpagedevice\"\n",
-             opt->name, opt->text, xdpi, ydpi, i);
+             opt->name, opt->text, xdpi, ydpi, i + 1);
   }
 
   stp_parameter_description_destroy(&desc);
@@ -1488,169 +1495,6 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 	    print_group_close(fp, j, k);
 	}
     }
-  if (has_quality_parameter)
-    {
-      stp_parameter_t qdesc;
-      const char *tname = NULL;
-      stp_describe_parameter(v, "Quality", &qdesc);
-      if (qdesc.p_type == STP_PARAMETER_TYPE_STRING_LIST &&
-	  stp_string_list_count(qdesc.bounds.str) > 1)
-	{
-	  for (l = 0; l < stp_string_list_count(qdesc.bounds.str); l++)
-	    {
-	      opt = stp_string_list_param(qdesc.bounds.str, l);
-	      if (opt && strcmp(opt->name, "None") != 0)
-		{
-		  tname = opt->name;
-		  break;
-		}
-	    }
-	}
-      for (l = 0; l < stp_parameter_list_count(param_list); l++)
-	{
-	  const stp_parameter_t *lparam =
-	    stp_parameter_list_param(param_list, l);
-	  if (lparam->p_class > STP_PARAMETER_CLASS_OUTPUT ||
-	      lparam->p_level > STP_PARAMETER_LEVEL_ADVANCED4 ||
-	      strcmp(lparam->name, "Quality") == 0 ||
-	      (lparam->p_type != STP_PARAMETER_TYPE_STRING_LIST &&
-	       lparam->p_type != STP_PARAMETER_TYPE_BOOLEAN &&
-	       lparam->p_type != STP_PARAMETER_TYPE_DIMENSION &&
-	       lparam->p_type != STP_PARAMETER_TYPE_DOUBLE))
-	    continue;
-	  stp_clear_string_parameter(v, "Quality");
-	  stp_describe_parameter(v, lparam->name, &desc);
-	  if (desc.is_active)
-	    {
-	      stp_parameter_description_destroy(&desc);
-	      stp_set_string_parameter(v, "Quality", tname);
-	      stp_describe_parameter(v, lparam->name, &desc);
-	      if (!desc.is_active)
-		{
-		  gzprintf(fp, "*UIConstraints: *StpQuality *Stp%s\n",
-			   lparam->name);
-		  gzprintf(fp, "*UIConstraints: *Stp%s *StpQuality\n\n",
-			   lparam->name);
-		  if (desc.p_type == STP_PARAMETER_TYPE_DOUBLE)
-		    {
-		      gzprintf(fp, "*UIConstraints: *StpQuality *StpFine%s\n",
-			       lparam->name);
-		      gzprintf(fp, "*UIConstraints: *StpFine%s *StpQuality\n\n",
-			       lparam->name);
-		    }		      
-		}
-	    }
-	  stp_clear_string_parameter(v, "Quality");
-	  stp_parameter_description_destroy(&desc);
-	}
-      stp_parameter_description_destroy(&qdesc);
-    }
-  if (has_image_type_parameter)
-    {
-      stp_parameter_t qdesc;
-      const char *tname = NULL;
-      stp_describe_parameter(v, "ImageType", &qdesc);
-      if (qdesc.p_type == STP_PARAMETER_TYPE_STRING_LIST &&
-	  stp_string_list_count(qdesc.bounds.str) > 1)
-	{
-	  for (l = 0; l < stp_string_list_count(qdesc.bounds.str); l++)
-	    {
-	      opt = stp_string_list_param(qdesc.bounds.str, l);
-	      if (opt && strcmp(opt->name, "None") != 0)
-		{
-		  tname = opt->name;
-		  break;
-		}
-	    }
-	}
-      for (l = 0; l < stp_parameter_list_count(param_list); l++)
-	{
-	  const stp_parameter_t *lparam =
-	    stp_parameter_list_param(param_list, l);
-	  if (lparam->p_class > STP_PARAMETER_CLASS_OUTPUT ||
-	      lparam->p_level > STP_PARAMETER_LEVEL_ADVANCED4 ||
-	      strcmp(lparam->name, "ImageType") == 0 ||
-	      (lparam->p_type != STP_PARAMETER_TYPE_STRING_LIST &&
-	       lparam->p_type != STP_PARAMETER_TYPE_BOOLEAN &&
-	       lparam->p_type != STP_PARAMETER_TYPE_DIMENSION &&
-	       lparam->p_type != STP_PARAMETER_TYPE_DOUBLE))
-	    continue;
-	  stp_clear_string_parameter(v, "ImageType");
-	  stp_describe_parameter(v, lparam->name, &desc);
-	  if (desc.is_active)
-	    {
-	      stp_parameter_description_destroy(&desc);
-	      stp_set_string_parameter(v, "ImageType", tname);
-	      stp_describe_parameter(v, lparam->name, &desc);
-	      if (!desc.is_active)
-		{
-		  gzprintf(fp, "*UIConstraints: *StpImageType *Stp%s\n",
-			   lparam->name);
-		  gzprintf(fp, "*UIConstraints: *Stp%s *StpImageType\n\n",
-			   lparam->name);
-		  if (desc.p_type == STP_PARAMETER_TYPE_DOUBLE)
-		    {
-		      gzprintf(fp, "*UIConstraints: *StpImageType *StpFine%s\n",
-			       lparam->name);
-		      gzprintf(fp, "*UIConstraints: *StpFine%s *StpImageType\n\n",
-			       lparam->name);
-		    }		      
-		}
-	    }
-	  stp_clear_string_parameter(v, "ImageType");
-	  stp_parameter_description_destroy(&desc);
-	}
-      stp_parameter_description_destroy(&qdesc);
-    }
-  if (printer_is_color)
-    {
-      for (l = 0; l < stp_parameter_list_count(param_list); l++)
-	{
-	  const stp_parameter_t *lparam =
-	    stp_parameter_list_param(param_list, l);
-	  if (lparam->p_class > STP_PARAMETER_CLASS_OUTPUT ||
-	      lparam->p_level > STP_PARAMETER_LEVEL_ADVANCED4 ||
-	      strcmp(lparam->name, "Quality") == 0 ||
-	      is_special_option(lparam->name) ||
-	      (lparam->p_type != STP_PARAMETER_TYPE_STRING_LIST &&
-	       lparam->p_type != STP_PARAMETER_TYPE_BOOLEAN &&
-	       lparam->p_type != STP_PARAMETER_TYPE_DIMENSION &&
-	       lparam->p_type != STP_PARAMETER_TYPE_DOUBLE))
-	    continue;
-	  stp_set_string_parameter(v, "PrintingMode", "Color");
-	  stp_describe_parameter(v, lparam->name, &desc);
-	  if (desc.is_active)
-	    {
-	      stp_parameter_description_destroy(&desc);
-	      stp_set_string_parameter(v, "PrintingMode", "BW");
-	      stp_describe_parameter(v, lparam->name, &desc);
-	      if (!desc.is_active)
-		{
-		  gzprintf(fp, "*UIConstraints: *ColorModel Gray *Stp%s\n",
-			   lparam->name);
-		  gzprintf(fp, "*UIConstraints: *ColorModel Black *Stp%s\n",
-			   lparam->name);
-		  gzprintf(fp, "*UIConstraints: *Stp%s *ColorModel Gray\n",
-			   lparam->name);
-		  gzprintf(fp, "*UIConstraints: *Stp%s *ColorModel Black\n\n",
-			   lparam->name);
-		  if (desc.p_type == STP_PARAMETER_TYPE_DOUBLE)
-		    {
-		      gzprintf(fp, "*UIConstraints: *ColorModel Gray *StpFine%s\n",
-			       lparam->name);
-		      gzprintf(fp, "*UIConstraints: *ColorModel Black *StpFine%s\n",
-			       lparam->name);
-		      gzprintf(fp, "*UIConstraints: *StpFine%s *ColorModel Gray\n",
-			       lparam->name);
-		      gzprintf(fp, "*UIConstraints: *StpFine%s *ColorModel Black\n\n",
-			       lparam->name);
-		    }
-		}
-	    }
-	  stp_parameter_description_destroy(&desc);
-	}
-      stp_set_string_parameter(v, "PrintingMode", "Color");
-    }
   stp_parameter_list_destroy(param_list);
 
  /*
@@ -1707,5 +1551,5 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 
 
 /*
- * End of "$Id: genppd.c,v 1.109 2005/10/18 02:08:16 rlk Exp $".
+ * End of "$Id: genppd.c,v 1.113 2005/12/31 21:27:29 rlk Exp $".
  */
diff --git a/src/cups/rastertoprinter.c b/src/cups/rastertoprinter.c
index b9da368..64b0d0d 100644
--- a/src/cups/rastertoprinter.c
+++ b/src/cups/rastertoprinter.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertoprinter.c,v 1.96 2005/04/23 00:26:07 rlk Exp $"
+ * "$Id: rastertoprinter.c,v 1.97 2005/12/24 23:15:23 rlk Exp $"
  *
  *   Gutenprint based raster filter for the Common UNIX Printing System.
  *
@@ -131,7 +131,13 @@ set_special_parameter(stp_vars_t *v, const char *name, int choice)
   stp_describe_parameter(v, name, &desc);
   if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
     {
-      if (choice >= stp_string_list_count(desc.bounds.str))
+      if (choice < 0)
+	{
+	  stp_clear_string_parameter(v, name);
+	  fprintf(stderr, "DEBUG: Gutenprint clear special parameter %s\n",
+		  name);
+	}
+      else if (choice >= stp_string_list_count(desc.bounds.str))
 	fprintf(stderr, "ERROR: Gutenprint unable to set %s!\n", name);
       else
 	{
@@ -368,8 +374,9 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       break;
     }
 
-  if (cups->header.cupsCompression >= 0)
-    set_special_parameter(v, "Resolution", cups->header.cupsCompression);
+  set_special_parameter(v, "Resolution", cups->header.cupsCompression - 1);
+
+  set_special_parameter(v, "Quality", cups->header.cupsRowFeed - 1);
 
   if (cups->header.MediaClass && strlen(cups->header.MediaClass) > 0)
     set_string_parameter(v, "InputSlot", cups->header.MediaClass);
@@ -1091,5 +1098,5 @@ Image_width(stp_image_t *image)	/* I - Image */
 
 
 /*
- * End of "$Id: rastertoprinter.c,v 1.96 2005/04/23 00:26:07 rlk Exp $".
+ * End of "$Id: rastertoprinter.c,v 1.97 2005/12/24 23:15:23 rlk Exp $".
  */
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index 91cb23a..4ba8eb2 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -292,10 +292,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/escputil/d4lib.c b/src/escputil/d4lib.c
index 8e3b092..3ae79a2 100644
--- a/src/escputil/d4lib.c
+++ b/src/escputil/d4lib.c
@@ -180,12 +180,12 @@ static errorMessage_t errorMessage[] =
 int SafeWrite(int fd, const void *data, int len)
 {
   int status;
-  int retries=3;
+  int retries=30;
   do
     {
       status = write(fd, data, len);
       if(status < len)
-	usleep(100000);
+	usleep(d4WrTimeout);
       retries--;
     }
   while ((status < len) && (retries > 0));
@@ -390,7 +390,7 @@ int readAnswer(int fd, unsigned char *buf, int len)
    long dt;
    int count = 0;
    /* wait a little bit before reading an answer */
-   usleep(20000);
+   usleep(d4RdTimeout);
 
    /* for error handling in case of timeout */
    timeoutGot = 0;
@@ -444,7 +444,7 @@ int readAnswer(int fd, unsigned char *buf, int len)
 	    len = (len > sizeof(buf))?sizeof(buf) - 1:len;
          }
       }
-      usleep(20000);
+      usleep(d4RdTimeout);
    }
    
    if ( debugD4 )
@@ -475,8 +475,8 @@ static void _flushData(int fd)
    struct itimerval ti, oti;
    char buf[1024];
    int len = 1023;
-   int count = 20;
-   usleep(20000);
+   int count = 200;
+   usleep(d4RdTimeout);
 
    /* for error handling in case of timeout */
    timeoutGot = 0;
@@ -489,7 +489,7 @@ static void _flushData(int fd)
      fprintf(stderr, "flush data: length: %i\n", len);
    do
      {
-       usleep(50000);
+       usleep(d4RdTimeout);
        SET_TIMER(ti,oti, d4RdTimeout);
        rd = read(fd, buf, len);
        if (debugD4)
@@ -990,7 +990,7 @@ int askForCredit(int fd, unsigned char socketID, int *sndSize, int *rcvSize)
    while (credit == 0 )
    {
       while((credit=CreditRequest(fd,socketID)) == 0  && count < MAX_CREDIT_REQUEST )
-         usleep(250000);
+         usleep(d4RdTimeout);
 
       if ( credit == -1 )
       {
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index 3be1bf3..8997a97 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.76 2005/10/01 18:47:29 rlk Exp $"
+ * "$Id: escputil.c,v 1.79 2005/12/31 21:23:08 rlk Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -503,7 +503,7 @@ read_from_printer(int fd, char *buf, int bufsize, int quiet)
       status = read(fd, buf, bufsize - 1);
       if (status == 0 || (status < 0 && errno == EAGAIN))
 	{
-	  usleep(20000);
+	  usleep(2000);
 	  status = 0; /* not an error (read would have blocked) */
 	}
     }
@@ -838,7 +838,8 @@ initialize_printer(int quiet, int fail_if_not_found)
     }
 
   close(fd);
-  STP_DEBUG(fprintf(stderr, "new? %s\n", isnew?"yes":"no"));
+  STP_DEBUG(fprintf(stderr, "new? %s found? %s\n", isnew?"yes":"no",
+		    found?"yes":"no"));
   return (found)?the_printer_t:NULL;
 }
 
@@ -851,7 +852,8 @@ get_printer(int quiet, int fail_if_not_found)
     {
       const stp_printer_t *printer =
 	initialize_printer(quiet, fail_if_not_found);
-      STP_DEBUG(fprintf(stderr, "init done...\n"));
+      STP_DEBUG(fprintf(stderr, "init done, printer found? %s...\n",
+			printer ? "yes" : "no"));
       return printer;
     }
 }
@@ -875,24 +877,41 @@ static const char *colors_new[] =
     N_("Gloss Optimizer"),	/* e */
     N_("Light Light Black"),	/* f */
   };
-
 static int color_count = sizeof(colors_new) / sizeof(const char *);
 
+static const char *aux_colors[] =
+  {
+    N_("Black"),		/* 0 */
+    N_("Cyan"),			/* 1 */
+    N_("Magenta"),		/* 2 */
+    N_("Yellow"),		/* 3 */
+    N_("Unknown"),		/* 4 */
+    N_("Unknown"),		/* 5 */
+    N_("Unknown"),		/* 6 */
+    N_("Unknown"),		/* 7 */
+    N_("Unknown"),		/* 8 */
+    N_("Red"),			/* 9 */
+    N_("Blue"),			/* a */
+    N_("Unknown"),		/* b */
+    N_("Unknown"),		/* c */
+    N_("Unknown"),		/* d */
+    N_("Unknown"),		/* e */
+    N_("Unknown"),		/* f */
+  };
+static int aux_color_count = sizeof(aux_colors) / sizeof(const char *);
+
 static void
 do_status_command_internal(status_cmd_t cmd)
 {
   int fd;
   int status;
   int credit;
-  int col_number;
   int retry = 4;
   char buf[1024];
   char *ind = NULL;
   char *oind;
   int i;
   const stp_printer_t *printer;
-  const stp_vars_t *printvars;
-  stp_parameter_t desc;
   const char *cmd_name = NULL;
   switch (cmd)
     {
@@ -912,21 +931,11 @@ do_status_command_internal(status_cmd_t cmd)
 
   STP_DEBUG(fprintf(stderr, "%s...\n", cmd_name));
   printer = get_printer(1, 0);
-  if (!printer)
-    {
-      fprintf(stderr, _("Cannot identify printer!\n"));
-      exit(0);
-    }
   if (!found_unknown_old_printer)
-    STP_DEBUG(fprintf(stderr, "%s found %s\n", cmd_name,
-		      stp_printer_get_long_name(printer)));
-  printvars = stp_printer_get_defaults(printer);
-  stp_describe_parameter(printvars, "ChannelNames", &desc);
-  if (desc.p_type != STP_PARAMETER_TYPE_STRING_LIST)
-    {
-      fprintf(stderr, _("Printer does not support listing ink types!\n"));
-      exit(1);
-    }
+    STP_DEBUG(fprintf(stderr, "%s found %s%s\n", cmd_name,
+		      printer ? stp_printer_get_long_name(printer) :
+		      printer_model,
+		      printer ? "" : "(Unknown model)"));
 
   fd = open(raw_device, O_RDWR, 0666);
   if (fd == -1)
@@ -948,7 +957,6 @@ do_status_command_internal(status_cmd_t cmd)
                 {
                   if ( ( status = readData(fd, socket_id, (unsigned char*)buf, 1023) ) <= -1 )
                     {
-                      stp_parameter_description_destroy(&desc);
                       exit(1);
                     }
 		  STP_DEBUG(fprintf(stderr, "readData try %d status %d\n", retry, status));
@@ -957,7 +965,6 @@ do_status_command_internal(status_cmd_t cmd)
 	      /* "@BCD ST ST"  found */
 	      if (!retry)
 		{
-		  stp_parameter_description_destroy(&desc);
 		  exit(1);
 		}
 	      buf[status] = '\0';
@@ -972,18 +979,19 @@ do_status_command_internal(status_cmd_t cmd)
 			i += buf[i + 1] + 2;
 		      ind = buf + i;
 		      i = 3;
-		      col_number = 0;
 		      printf("%18s    %20s\n", _("Ink color"), _("Percent remaining"));
 		      while (i < ind[1])
 			{
 			  if (ind[i] < color_count)
 			    printf("%18s    %20d\n", _(colors_new[(int) ind[i]]), ind[i + 2]);
+			  else if (ind[i] == 0x40 && ind[i + 1] < aux_color_count)
+			    printf("%18s    %20d\n", _(aux_colors[(int) ind[i + 1]]), ind[i + 2]);
 			  else
-			    printf("%18s    %20d\n", _("Unknown"), ind[i + 2]);
-			  col_number++;
+			    printf("%8s 0x%2x 0x%2x    %20d\n", _("Unknown"), (unsigned char) ind[i], (unsigned char) ind[i + 1], ind[i + 2]);
 			  i+=3;
 			}
 		      ind = NULL;
+		      exit(0);
 		    }
 		  else
 		    /* old format */
@@ -1009,14 +1017,12 @@ do_status_command_internal(status_cmd_t cmd)
             }
           else /* could not write */
             {
-              stp_parameter_description_destroy(&desc);
               fprintf(stderr, _("\nCannot write to %s: %s\n"), raw_device, strerror(errno));
               exit(1);
             }
         }
       else /* no credit */
         {
-          stp_parameter_description_destroy(&desc);
           STP_DEBUG(fprintf(stderr, _("\nCannot get credit (packet mode)!\n")));
           exit(1);
         }
@@ -1038,7 +1044,6 @@ do_status_command_internal(status_cmd_t cmd)
           status = read_from_printer(fd, buf, 1024, 1);
           if (status < 0)
             {
-              stp_parameter_description_destroy(&desc);
               exit(1);
             }
           ind = buf;
@@ -1060,12 +1065,20 @@ do_status_command_internal(status_cmd_t cmd)
 
   if (!ind)
     {
-      stp_parameter_description_destroy(&desc);
       exit(1);
     }
 
   if (cmd == CMD_INK_LEVEL)
     {
+      stp_parameter_t desc;
+      const stp_vars_t *printvars;
+      printvars = stp_printer_get_defaults(printer);
+      stp_describe_parameter(printvars, "ChannelNames", &desc);
+      if (desc.p_type != STP_PARAMETER_TYPE_STRING_LIST)
+	{
+	  fprintf(stderr, _("Printer does not support listing ink types!\n"));
+	  exit(1);
+	}
       ind += 3;
 
       printf("%18s    %20s\n", _("Ink color"), _("Percent remaining"));
@@ -1090,6 +1103,7 @@ do_status_command_internal(status_cmd_t cmd)
 		 val);
 	  ind += 2;
 	}
+      stp_parameter_description_destroy(&desc);
     }
   else
     {
@@ -1098,7 +1112,6 @@ do_status_command_internal(status_cmd_t cmd)
 	*where = '\n';
       printf("%s\n", ind);
     }
-  stp_parameter_description_destroy(&desc);
   (void) close(fd);
   exit(0);
 }
@@ -1133,13 +1146,14 @@ do_extended_ink_info(int extended_output)
     }
 
   printer = get_printer(1, 0);
-  if (!printer)
+  if (printer)
     {
-      fprintf(stderr, _("Cannot identify printer!\n"));
-      exit(0);
+      printvars = stp_printer_get_defaults(printer);
+      stp_describe_parameter(printvars, "ChannelNames", &desc);
     }
-  printvars = stp_printer_get_defaults(printer);
-  stp_describe_parameter(printvars, "ChannelNames", &desc);
+  else
+    printf("Warning! Printer %s is not known; information may be incomplete or incorrect\n",
+	   printer_model);
 
   fd = open(raw_device, O_RDWR, 0666);
   if (fd == -1)
@@ -1151,7 +1165,89 @@ do_extended_ink_info(int extended_output)
 
   if (isnew)
     {
-      for (i = 0; i < stp_string_list_count(desc.bounds.str); i++)
+      stp_string_list_t *color_list = stp_string_list_create();
+
+      if (!printer)
+	{
+	  /*
+	   * If we're using the "new" ink status format and we don't know
+	   * about the printer, take the colors from the ink status
+	   * message rather than from the ink list.  This gives us a
+	   * last chance to determine the inks
+	   */
+	  credit = askForCredit(fd, socket_id, &send_size, &receive_size);
+	  if ( credit > -1 )
+	    {
+	      /* request status command */
+	      if ( (status = writeData(fd, socket_id, (const unsigned char*)"st\1\0\1", 5, 1)) > 0 )
+		{
+		  do
+		    {
+		      if ((status = readData(fd, socket_id, (unsigned char*)buf, 1023)) <= -1)
+			{
+			  stp_parameter_description_destroy(&desc);
+			  exit(1);
+			}
+		      STP_DEBUG(fprintf(stderr, "readData try %d status %d\n", retry, status));
+		    }
+		  while ( (retry-- != 0) && strncmp("st", buf, 2) && strncmp("@BDC ST", buf, 7) );
+		  /* "@BCD ST ST"  found */
+		  if (!retry)
+		    {
+		      stp_parameter_description_destroy(&desc);
+		      exit(1);
+		    }
+		  buf[status] = '\0';
+		  if ( buf[7] == '2' )
+		    {
+		      STP_DEBUG(fprintf(stderr, "New format ink!\n"));
+		      /* new binary format ! */
+		      i = 10;
+		      while (buf[i] != 0x0f && i < status)
+			i += buf[i + 1] + 2;
+		      ind = buf + i;
+		      i = 3;
+		      while (i < ind[1])
+			{
+			  if (ind[i] < color_count)
+			    stp_string_list_add_string(color_list,
+						       colors_new[(int) ind[i]],
+						       colors_new[(int) ind[i]]);
+			  else if (ind[i] == 0x40 && ind[i + 1] < aux_color_count)
+			    stp_string_list_add_string(color_list,
+						       aux_colors[(int) ind[i + 1]],
+						       aux_colors[(int) ind[i + 1]]);
+			  else
+			    stp_string_list_add_string(color_list, "Unknown",
+						       "Unknown");
+			  i+=3;
+			}
+		    }
+		}
+	      else /* could not write */
+		{
+		  stp_parameter_description_destroy(&desc);
+		  fprintf(stderr, _("\nCannot write to %s: %s\n"), raw_device, strerror(errno));
+		  exit(1);
+		}
+	    }
+	  else /* no credit */
+	    {
+	      stp_parameter_description_destroy(&desc);
+	      STP_DEBUG(fprintf(stderr, _("\nCannot get credit (packet mode)!\n")));
+	      exit(1);
+	    }
+	  STP_DEBUG(fprintf(stderr, "Using color list from status message\n"));
+	}
+      else
+	{
+	  color_list = stp_string_list_create_copy(desc.bounds.str);
+	  STP_DEBUG(fprintf(stderr, "Using color list from driver (%d %d)\n",
+			    stp_string_list_count(desc.bounds.str),
+			    stp_string_list_count(color_list)));
+	  stp_parameter_description_destroy(&desc);
+	}
+      for (i = 0; i < stp_string_list_count(color_list); i++)
         {
           credit = askForCredit(fd, socket_id, &send_size, &receive_size);
           if ( credit > -1 )
@@ -1166,37 +1262,37 @@ do_extended_ink_info(int extended_output)
                     {
                       if ( ( status = readData(fd, socket_id, (unsigned char*) buf, 1023) ) <= -1 )
                         {
-                          stp_parameter_description_destroy(&desc);
                           exit(1);
                         }
                     } while ((retry-- != 0) && strncmp("ii", buf, 2) && strncmp("@BDC PS", buf, 7));
                   if (!retry) /* couldn't read answer */
                     {
-                      stp_parameter_description_destroy(&desc);
                       exit(1);
                     }
                   ind = strchr(buf, 'I');
-		  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)
+		  if (!ind)
+		    printf("Cannot identify cartridge in slot %d\n", i);
+		  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,%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),
+                             _(stp_string_list_param(color_list, 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),
+                             _(stp_string_list_param(color_list, j)->text),
                              iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
 		      break;
 		    }
@@ -1216,11 +1312,11 @@ do_extended_ink_info(int extended_output)
 			     _("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),
+                             _(stp_string_list_param(color_list, 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),
+                             _(stp_string_list_param(color_list, j)->text),
                              iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
 		      break;
 		    }
@@ -1236,22 +1332,25 @@ do_extended_ink_info(int extended_output)
                                _("Ink color"), _("Percent remaining"), _("Part number"),
                                _("Date"));
                       printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
-                             _(stp_string_list_param(desc.bounds.str, i)->text),
+                             _(stp_string_list_param(color_list, i)->text),
                              val, id, (year > 80 ? 19 : 20), year, month);
                     }
+		  else
+		    {
+		      printf("Cannot identify cartridge in slot %d\n", i);
+		    }
                 }
               else /* could not write */
                 {
-                  stp_parameter_description_destroy(&desc);
                   exit(1);
                 }
             }
           else /* no credit */
             {
-              stp_parameter_description_destroy(&desc);
               exit(1);
             }
         }
+      stp_string_list_destroy(color_list);
       CloseChannel(fd, socket_id);
     }
   else
@@ -1259,7 +1358,6 @@ do_extended_ink_info(int extended_output)
       (void) close(fd);
       do_ink_level();
     }
-  stp_parameter_description_destroy(&desc);
   exit(0);
 }
 
@@ -1284,6 +1382,8 @@ do_identify(void)
 	printf("%s\n", _(stp_printer_get_long_name(printer)));
       exit(0);
     }
+  else if (printer_model)
+    printf("EPSON %s\n", printer_model);
   else
     {
       fprintf(stderr, _("Cannot identify printer model.\n"));
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index 2cbf359..52bb281 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -310,10 +310,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/foomatic/foomatic-generator.in b/src/foomatic/foomatic-generator.in
index e1ffa44..d3cf386 100644
--- a/src/foomatic/foomatic-generator.in
+++ b/src/foomatic/foomatic-generator.in
@@ -1269,6 +1269,8 @@ sub qualityorder {
 		    "hquni",
 		    "hq2",
 		    "hq2uni",
+		    "ov",
+		    "oov",
 		    # Canon
 		    "dmt",
 		    );
diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap
index a7d7ee7..4e3eeef 100644
--- a/src/foomatic/foomatic-printermap
+++ b/src/foomatic/foomatic-printermap
@@ -245,8 +245,11 @@
 #gptofoo escp2-cx3650 printer/Epson-Stylus_CX3650
 #gptofoo escp2-cx3700 printer/Epson-Stylus_CX3700
 #gptofoo escp2-cx3800 printer/Epson-Stylus_CX3800
+#gptofoo escp2-cx3805 printer/Epson-Stylus_CX3805
 #gptofoo escp2-cx3810 printer/Epson-Stylus_CX3810
+#gptofoo escp2-cx4100 printer/Epson-Stylus_CX4100
 #gptofoo escp2-cx4200 printer/Epson-Stylus_CX4200
+#gptofoo escp2-cx4500 printer/Epson-Stylus_CX4500
 #gptofoo escp2-cx4600 printer/Epson-Stylus_CX4600
 #gptofoo escp2-cx4700 printer/Epson-Stylus_CX4700
 #gptofoo escp2-cx4800 printer/Epson-Stylus_CX4800
@@ -254,6 +257,7 @@
 #gptofoo escp2-cx5200 printer/Epson-Stylus_CX5200
 #gptofoo escp2-cx5300 printer/Epson-Stylus_CX5300
 #gptofoo escp2-cx5400 printer/Epson-Stylus_CX5400
+#gptofoo escp2-cx5700 printer/Epson-Stylus_CX5700
 #gptofoo escp2-cx5800 printer/Epson-Stylus_CX5800
 #gptofoo escp2-cx6300 printer/Epson-Stylus_CX6300
 #gptofoo escp2-cx6400 printer/Epson-Stylus_CX6400
@@ -268,10 +272,14 @@
 #gptofoo escp2-dx3800 printer/Epson-Stylus_DX3800
 #gptofoo escp2-dx3850 printer/Epson-Stylus_DX3850
 #gptofoo escp2-dx4200 printer/Epson-Stylus_DX4200
+#gptofoo escp2-dx4250 printer/Epson-Stylus_DX4250
 #gptofoo escp2-dx4800 printer/Epson-Stylus_DX4800
+#gptofoo escp2-picmate printer/Epson-PictureMate
+#gptofoo escp2-picmated printer/Epson-PictureMate_Deluxe
 #gptofoo escp2-cl700 printer/Epson-CL_700
 #gptofoo escp2-cl750 printer/Epson-CL_750
 #gptofoo escp2-cl760 printer/Epson-CL_760
+#gptofoo escp2-e100 printer/Epson-E_100
 #gptofoo escp2-em900c printer/Epson-EM_900C
 #gptofoo escp2-em930c printer/Epson-EM_930C
 #gptofoo escp2-mc2000 printer/Epson-MC_2000
@@ -284,16 +292,9 @@
 #gptofoo escp2-mj6000c printer/Epson-MJ_6000C
 #gptofoo escp2-mj8000c printer/Epson-MJ_8000C
 #gptofoo escp2-pm700c printer/Epson-PM_700C
-#gptofoo escp2-pmg700 printer/Epson-PM_G700
-#gptofoo escp2-pmg720 printer/Epson-PM_G720
-#gptofoo escp2-pmg800 printer/Epson-PM_G800
-#gptofoo escp2-pmg820 printer/Epson-PM_G820
 #gptofoo escp2-pm730c printer/Epson-PM_730C
 #gptofoo escp2-pm740c printer/Epson-PM_740C
 #gptofoo escp2-pm750c printer/Epson-PM_750C
-#gptofoo escp2-pmd750 printer/Epson-PM_D750
-#gptofoo escp2-pmd770 printer/Epson-PM_D770
-#gptofoo escp2-pmd1000 printer/Epson-PM_D1000
 #gptofoo escp2-pm760c printer/Epson-PM_760C
 #gptofoo escp2-pm770c printer/Epson-PM_770C
 #gptofoo escp2-pm780c printer/Epson-PM_780C
@@ -318,11 +319,21 @@
 #gptofoo escp2-pm7000c printer/Epson-PM_7000C
 #gptofoo escp2-pm9000c printer/Epson-PM_9000C
 #gptofoo escp2-pm10000 printer/Epson-PM_10000
+#gptofoo escp2-pma900 printer/Epson-PM_A900
+#gptofoo escp2-pmd750 printer/Epson-PM_D750
+#gptofoo escp2-pmd770 printer/Epson-PM_D770
+#gptofoo escp2-pmd1000 printer/Epson-PM_D1000
+#gptofoo escp2-pmg700 printer/Epson-PM_G700
+#gptofoo escp2-pmg720 printer/Epson-PM_G720
+#gptofoo escp2-pmg800 printer/Epson-PM_G800
+#gptofoo escp2-pmg820 printer/Epson-PM_G820
+#gptofoo escp2-pxa650 printer/Epson-PX_A650
 #gptofoo escp2-pxg900 printer/Epson-PX_G900
 #gptofoo escp2-pxg920 printer/Epson-PX_G920
 #gptofoo escp2-pxg5000 printer/Epson-PX_G5000
 #gptofoo escp2-pxv500 printer/Epson-PX_V500
 #gptofoo escp2-pxv600 printer/Epson-PX_V600
+#gptofoo escp2-px5500 printer/Epson-PX_5500
 #gptofoo escp2-px7000 printer/Epson-PX_7000
 #gptofoo escp2-px9000 printer/Epson-PX_9000
 #gptofoo fujifilm-cx400 printer/Fujifilm-Printpix-CX-400
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index 6479033..4db2b1d 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -297,10 +297,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/gimp/Makefile.in b/src/gimp/Makefile.in
index 95fccd5..fa5c842 100644
--- a/src/gimp/Makefile.in
+++ b/src/gimp/Makefile.in
@@ -292,10 +292,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index fbcb0fb..d520068 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -292,10 +292,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/gutenprintui/Makefile.in b/src/gutenprintui/Makefile.in
index f9cd11b..55f33a0 100644
--- a/src/gutenprintui/Makefile.in
+++ b/src/gutenprintui/Makefile.in
@@ -311,10 +311,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/gutenprintui/gutenprintui.pc.in b/src/gutenprintui/gutenprintui.pc.in
index 4e98dcf..42e350e 100644
--- a/src/gutenprintui/gutenprintui.pc.in
+++ b/src/gutenprintui/gutenprintui.pc.in
@@ -7,5 +7,6 @@ Name: Gutenprint UI (GTK+-1.2 version)
 Description: Gutenprint Top Quality Printer Drivers - GTK+-1.2 User Interface
 Requires: gutenprint
 Version: @VERSION@
-Libs: -L${libdir} @gutenprintui_libs@
+Libs: -L${libdir} @GUTENPRINTUI_LIBS@
+Libs.private: @gutenprintui_libdeps@
 Cflags: -I${includedir} @gutenprintui_cflags@
diff --git a/src/gutenprintui/panel.c b/src/gutenprintui/panel.c
index e6ba4db..81ce574 100644
--- a/src/gutenprintui/panel.c
+++ b/src/gutenprintui/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.5 2005/09/17 21:54:33 rlk Exp $"
+ * "$Id: panel.c,v 1.7 2005/12/30 20:32:07 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -883,10 +883,17 @@ populate_options(const stp_vars_t *v)
 }
 
 static void
+destroy_something(GtkWidget *widget, gpointer data)
+{
+  gtk_widget_destroy(widget);
+}
+
+static void
 populate_option_table(GtkWidget *table, int p_class)
 {
   int i, j;
   int current_pos = 0;
+  GtkWidget *previous_sep = NULL;
   int counts[STP_PARAMETER_LEVEL_INVALID][STP_PARAMETER_TYPE_INVALID];
   int vpos[STP_PARAMETER_LEVEL_INVALID][STP_PARAMETER_TYPE_INVALID];
   for (i = 0; i < STP_PARAMETER_LEVEL_INVALID; i++)
@@ -897,6 +904,8 @@ populate_option_table(GtkWidget *table, int p_class)
       }
 
 
+  gtk_container_foreach(GTK_CONTAINER(table), destroy_something, NULL);
+
   /* First scan the options to figure out where to start */
   for (i = 0; i < current_option_count; i++)
     {
@@ -925,26 +934,29 @@ populate_option_table(GtkWidget *table, int p_class)
     }
 
   /* Now, figure out where we're going to put the options */
-  for (i = 0; i < STP_PARAMETER_LEVEL_INVALID; i++)
+  for (i = 0; i <= MAXIMUM_PARAMETER_LEVEL + 1; i++)
     {
       int level_count = 0;
-      for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++)
-	level_count += counts[i][j];
+      if (i <= MAXIMUM_PARAMETER_LEVEL)
+	for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++)
+	  level_count += counts[i][j];
       if (level_count > 0 && current_pos > 0)
 	{
 	  GtkWidget *sep = gtk_hseparator_new();
 	  gtk_table_attach(GTK_TABLE(table), sep, 0, 4,
 			   current_pos, current_pos + 1,
 			   GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
-	  if (i <= MAXIMUM_PARAMETER_LEVEL)
-	    gtk_widget_show(sep);
+	  if (previous_sep)
+	    gtk_widget_show(previous_sep);
+	  previous_sep = sep;
 	  current_pos++;
 	}
-      for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++)
-	{
-	  vpos[i][j] = current_pos;
-	  current_pos += counts[i][j];
-	}
+      if (i <= MAXIMUM_PARAMETER_LEVEL)
+	for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++)
+	  {
+	    vpos[i][j] = current_pos;
+	    current_pos += counts[i][j];
+	  }
     }
 
   for (i = 0; i < current_option_count; i++)
@@ -1372,7 +1384,6 @@ create_copy_number_frame(void)
   GtkWidget *event_box;
   GtkAdjustment *adj;
 
-  fprintf(stderr, "create_copy_number_frame\n");
   frame = gtk_frame_new (_("Number of Copies"));
   gtk_box_pack_start (GTK_BOX (right_vbox), frame, FALSE, TRUE, 0);
   gtk_widget_show (frame);
diff --git a/src/gutenprintui/printrcl.c b/src/gutenprintui/printrcl.c
index ee98f73..e1718e4 100644
--- a/src/gutenprintui/printrcl.c
+++ b/src/gutenprintui/printrcl.c
@@ -1,85 +1,32 @@
-
-#line 3 "printrcl.c"
-
-#define  YY_INT_ALIGNED short int
-
 /* 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 $
+ */
+
 #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. */
-
-/* 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)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
 #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
 
@@ -87,17 +34,34 @@ typedef unsigned int flex_uint32_t;
 
 #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
 
@@ -112,71 +76,71 @@ typedef unsigned int flex_uint32_t;
  * 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
 
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
+/* 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 yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
+		*yy_cp = yy_hold_char; \
 		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		yy_c_buf_p = yy_cp = yy_bp + n - 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).
  */
-
-#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;
@@ -213,16 +177,12 @@ 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
@@ -236,33 +196,23 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-
 	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-/* 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. */
+static YY_BUFFER_STATE yy_current_buffer = 0;
 
 /* 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_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
+#define YY_CURRENT_BUFFER yy_current_buffer
 
-/* 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. */
@@ -275,93 +225,69 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-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 yyrestart YY_PROTO(( FILE *input_file ));
 
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+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 )
 
-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  );
+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 ));
 
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+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 * ));
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_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; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_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; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
 
-#define yywrap(n) 1
-#define YY_SKIP_YYWRAP
 
+#define yywrap() 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 (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[]  );
+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[] ));
 
 /* 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 = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
+	yytext_ptr = yy_bp; \
+	yyleng = (int) (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
-/* 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] =
+static yyconst short int yy_accept[335] =
     {   0,
         0,    0,   41,   40,   37,   39,   40,   38,   40,   40,
        31,   35,   35,   35,   35,   35,   35,   35,   35,   35,
@@ -402,7 +328,7 @@ static yyconst flex_int16_t yy_accept[335] =
         0,    2,   18,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -434,7 +360,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[39] =
+static yyconst int yy_meta[39] =
     {   0,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    3,
         3,    1,    3,    3,    3,    3,    3,    3,    3,    3,
@@ -442,7 +368,7 @@ static yyconst flex_int32_t yy_meta[39] =
         3,    3,    3,    3,    3,    3,    3,    3
     } ;
 
-static yyconst flex_int16_t yy_base[340] =
+static yyconst short int yy_base[340] =
     {   0,
         0,    0,  374,  375,  371,  375,  368,  343,  364,   29,
        32,  336,  341,   18,   26,   21,   32,  343,    0,  340,
@@ -483,7 +409,7 @@ static yyconst flex_int16_t yy_base[340] =
        81,  375,  375,  375,   94,   97,  100,   89,  103
     } ;
 
-static yyconst flex_int16_t yy_def[340] =
+static yyconst short int yy_def[340] =
     {   0,
       334,    1,  334,  334,  334,  334,  335,  336,  337,  334,
       334,  338,  338,  338,  338,  338,  338,  338,  338,  338,
@@ -524,7 +450,7 @@ static yyconst flex_int16_t yy_def[340] =
       334,  334,  334,    0,  334,  334,  334,  334,  334
     } ;
 
-static yyconst flex_int16_t yy_nxt[414] =
+static yyconst short int yy_nxt[414] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        11,    4,    4,   12,   13,   14,   15,   16,   17,   18,
@@ -574,7 +500,7 @@ static yyconst flex_int16_t yy_nxt[414] =
       334,  334,  334
     } ;
 
-static yyconst flex_int16_t yy_chk[414] =
+static yyconst short int yy_chk[414] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -627,9 +553,6 @@ static yyconst flex_int16_t 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.
  */
@@ -639,6 +562,7 @@ int yy_flex_debug = 0;
 #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 $"
  *
@@ -697,21 +621,7 @@ q_strdup(const char *s)
     return g_strndup(s + 1, strlen(s) - 2);
 }
 
-#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
+#line 625 "printrcl.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -719,30 +629,65 @@ q_strdup(const char *s)
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap YY_PROTO(( void ));
 #else
-extern int yywrap (void );
+extern int yywrap YY_PROTO(( void ));
 #endif
 #endif
 
-    static void yyunput (int c,char *buf_ptr  );
-    
+#ifndef YY_NO_UNPUT
+static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+#endif
+
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput YY_PROTO(( void ));
 #else
-static int input (void );
+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
 
+#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. */
@@ -751,6 +696,7 @@ static int input (void );
 #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().
@@ -763,10 +709,9 @@ static int input (void );
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+	if ( yy_current_buffer->yy_is_interactive ) \
 		{ \
-		int c = '*'; \
-		size_t n; \
+		int c = '*', n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -776,22 +721,9 @@ static int input (void );
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	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); \
-			} \
-		}\
-\
-
+	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+		  && ferror( yyin ) ) \
+		YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -812,18 +744,12 @@ static int input (void );
 #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_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
+#define YY_DECL int yylex YY_PROTO(( void ))
+#endif
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -840,29 +766,27 @@ extern int yylex (void);
 #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 855 "printrcl.c"
+#line 779 "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;
@@ -870,36 +794,34 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
+		if ( ! yy_current_buffer )
+			yy_current_buffer =
+				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 )
 				{
@@ -916,22 +838,24 @@ 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:
@@ -1095,7 +1019,6 @@ 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;
@@ -1111,7 +1034,6 @@ 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;
@@ -1127,7 +1049,6 @@ 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++;
@@ -1137,33 +1058,33 @@ YY_RULE_SETUP
 #line 116 "printrcl.l"
 ECHO;
 	YY_BREAK
-#line 1141 "printrcl.c"
+#line 1062 "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_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+		if ( yy_current_buffer->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_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			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;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1173,13 +1094,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_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p <= &yy_current_buffer->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
@@ -1192,30 +1113,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
@@ -1226,7 +1147,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;
@@ -1234,30 +1155,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_LVALUE->yy_ch_buf[(yy_n_chars)];
+				yy_c_buf_p =
+				&yy_current_buffer->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;
@@ -1268,7 +1189,8 @@ 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
  *
@@ -1277,20 +1199,21 @@ 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 (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
+
+static int yy_get_next_buffer()
+	{
+	register char *dest = yy_current_buffer->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_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+	if ( yy_current_buffer->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.
@@ -1310,30 +1233,34 @@ static int yy_get_next_buffer (void)
 	/* 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_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( yy_current_buffer->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_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
 
 	else
 		{
-			size_t num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+		int num_to_read =
+			yy_current_buffer->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 )
 				{
@@ -1346,7 +1273,8 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yy_flex_realloc( (void *) b->yy_ch_buf,
+							 b->yy_buf_size + 2 );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1356,35 +1284,35 @@ static int yy_get_next_buffer (void)
 				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_LVALUE->yy_buf_size -
+			num_to_read = yy_current_buffer->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_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
+			yy_n_chars, num_to_read );
 
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		yy_current_buffer->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_LVALUE->yy_buffer_status =
+			yy_current_buffer->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1392,31 +1320,32 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	(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;
+	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;
 
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+	yytext_ptr = &yy_current_buffer->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 (void)
-{
+static yy_state_type yy_get_previous_state()
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
 
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+	yy_current_state = yy_start;
+
+	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 )
 			{
@@ -1428,23 +1357,30 @@ static int yy_get_next_buffer (void)
 		}
 
 	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 );
  */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_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
+	{
 	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 )
 		{
@@ -1456,73 +1392,80 @@ static int yy_get_next_buffer (void)
 	yy_is_jam = (yy_current_state == 334);
 
 	return yy_is_jam ? 0 : yy_current_state;
-}
+	}
 
-    static void yyunput (int c, register char * yy_bp )
-{
-	register char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
+
+#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;
 
 	/* undo effects of setting up yytext */
-	*yy_cp = (yy_hold_char);
+	*yy_cp = yy_hold_char;
 
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+	if ( yy_cp < yy_current_buffer->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_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		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 char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+				&yy_current_buffer->yy_ch_buf[number_to_move];
 
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+		while ( source > yy_current_buffer->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+		yy_current_buffer->yy_n_chars =
+			yy_n_chars = yy_current_buffer->yy_buf_size;
 
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		if ( yy_cp < yy_current_buffer->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;
-}
 
-#ifndef YY_NO_INPUT
+	yytext_ptr = yy_bp;
+	yy_hold_char = *yy_cp;
+	yy_c_buf_p = yy_cp;
+	}
+#endif	/* ifndef YY_NO_UNPUT */
+
+
 #ifdef __cplusplus
-    static int yyinput (void)
+static int yyinput()
 #else
-    static int input  (void)
+static int input()
 #endif
-
-{
+	{
 	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+	*yy_c_buf_p = yy_hold_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_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p < &yy_current_buffer->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()
@@ -1536,16 +1479,16 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					yyrestart(yyin );
+					yyrestart( yyin );
 
-					/*FALLTHROUGH*/
+					/* fall through */
 
 				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();
@@ -1555,92 +1498,90 @@ static int yy_get_next_buffer (void)
 					}
 
 				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;
-}
-#endif	/* ifndef YY_NO_INPUT */
+	}
 
-/** 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 );
+
+#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 );
+
+	yy_init_buffer( yy_current_buffer, input_file );
+	yy_load_buffer_state();
 	}
 
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
 
-/** 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 )
+#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 )
 		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_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		*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_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
+	yy_current_buffer = 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;
-}
+	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);
-}
 
-/** 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 )
-{
+#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;
+	}
+
+
+#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
+	{
 	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1649,75 +1590,80 @@ static void yy_load_buffer_state  (void)
 	/* 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 *) yyalloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yy_flex_alloc( 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;
-}
+	}
 
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
+
+#ifdef YY_USE_PROTOS
+void yy_delete_buffer( YY_BUFFER_STATE b )
+#else
+void yy_delete_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+	{
 	if ( ! b )
 		return;
 
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+	if ( b == yy_current_buffer )
+		yy_current_buffer = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
+		yy_flex_free( (void *) b->yy_ch_buf );
 
-	yyfree((void *) b  );
-}
+	yy_flex_free( (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 )
 
-{
-	int oerrno = errno;
-    
-	yy_flush_buffer(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
+
+
+	{
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* 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 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
+	}
 
-/** 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 )
+
+#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 )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1734,121 +1680,29 @@ extern int isatty (int );
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	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;
+	if ( b == yy_current_buffer )
+		yy_load_buffer_state();
 	}
 
-	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 )
-{
+#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 ( 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) yyalloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -1862,43 +1716,47 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, 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
 
-/** 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) );
-}
 
-/** 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 )
-{
+#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
+
+
+#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
+	{
 	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 *) yyalloc(n  );
+	buf = (char *) yy_flex_alloc( n );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -1907,7 +1765,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, 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()" );
 
@@ -1917,164 +1775,148 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
 	b->yy_is_our_buffer = 1;
 
 	return b;
-}
+	}
+#endif
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
+
+#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;
 #endif
+	{
+	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+		{
+		yy_size_t new_size;
 
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
+		yy_start_stack_depth += YY_START_STACK_INCR;
+		new_size = yy_start_stack_depth * sizeof( int );
 
-/* Redefine yyless() so it works in section 3 code. */
+		if ( ! yy_start_stack )
+			yy_start_stack = (int *) yy_flex_alloc( 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 )
+		else
+			yy_start_stack = (int *) yy_flex_realloc(
+					(void *) yy_start_stack, new_size );
 
-/* Accessor  methods (get/set functions) to struct members. */
+		if ( ! yy_start_stack )
+			YY_FATAL_ERROR(
+			"out of memory expanding start-condition stack" );
+		}
 
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
+	yy_start_stack[yy_start_stack_ptr++] = YY_START;
 
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
+	BEGIN(new_state);
+	}
+#endif
 
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
 
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
+#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 current token.
- * 
- */
+	BEGIN(yy_start_stack[yy_start_stack_ptr]);
+	}
+#endif
 
-char *yyget_text  (void)
-{
-        return yytext;
-}
 
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state()
+	{
+	return yy_start_stack[yy_start_stack_ptr - 1];
+	}
+#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 ;
-}
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
 
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_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 );
+	}
 
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
 
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
 
-/* 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();
-	}
+/* Redefine yyless() so it works in section 3 code. */
 
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
+#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 )
 
-    return 0;
-}
 
-/*
- * Internal utility routines.
- */
+/* Internal utility routines. */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
+#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
+	{
 	register int i;
-    	for ( i = 0; i < n; ++i )
+	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-}
+	}
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
+#ifdef YY_USE_PROTOS
+static int yy_flex_strlen( yyconst char *s )
+#else
+static int yy_flex_strlen( s )
+yyconst char *s;
+#endif
+	{
 	register int n;
-    	for ( n = 0; s[n]; ++n )
+	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-}
+	}
 #endif
 
-void *yyalloc (yy_size_t  size )
-{
+
+#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
+	{
 	return (void *) malloc( size );
-}
+	}
 
-void *yyrealloc  (void * ptr, yy_size_t  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
+	{
 	/* 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
@@ -2083,25 +1925,23 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#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_USE_PROTOS
+static void yy_flex_free( void *ptr )
+#else
+static void yy_flex_free( ptr )
+void *ptr;
+#endif
+	{
+	free( ptr );
+	}
 
-#ifdef YY_DECL_IS_OURS
-#undef YY_DECL_IS_OURS
-#undef YY_DECL
+#if YY_MAIN
+int main()
+	{
+	yylex();
+	return 0;
+	}
 #endif
 #line 116 "printrcl.l"
diff --git a/src/gutenprintui/printrcy.c b/src/gutenprintui/printrcy.c
index a0a27da..1609566 100644
--- a/src/gutenprintui/printrcy.c
+++ b/src/gutenprintui/printrcy.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, 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,9 +36,6 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
-/* Bison version.  */
-#define YYBISON_VERSION "2.1"
-
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -96,7 +93,6 @@
      pCURVE = 295
    };
 #endif
-/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
@@ -187,11 +183,6 @@ 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 */
@@ -204,48 +195,22 @@ typedef int YYSTYPE;
 /* Copy the second part of user declarations.  */
 
 
-/* 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
+/* Line 214 of yacc.c.  */
+#line 199 "printrcy.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   else
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
+# else
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
 #    define YYSTACK_ALLOC alloca
-#    if defined (__STDC__) || defined (__cplusplus)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     define YYINCLUDED_STDLIB_H
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
 #    endif
 #   endif
 #  endif
@@ -254,51 +219,25 @@ 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
-#  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
-}
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
 #  endif
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+	 || (YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  short yyss;
   YYSTYPE yyvs;
   };
 
@@ -308,20 +247,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 int) + sizeof (YYSTYPE))			\
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  YYSIZE_T yyi;				\
+	  register YYSIZE_T yyi;		\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
@@ -350,7 +289,7 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short int yysigned_char;
+   typedef short yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
@@ -371,7 +310,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.  */
@@ -450,7 +389,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const unsigned short yyrline[] =
 {
        0,   100,   100,   111,   118,   128,   138,   148,   158,   164,
      168,   172,   176,   180,   184,   188,   206,   210,   214,   217,
@@ -463,37 +402,37 @@ static const unsigned short int yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[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 int yytoknum[] =
+static const unsigned short yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -634,6 +573,22 @@ 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)
@@ -641,8 +596,7 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
+#define YYERROR		goto yyerrlab1
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -663,59 +617,26 @@ do								\
       goto yybackup;						\
     }								\
   else								\
-    {								\
-      yyerror (YY_("syntax error: cannot back up")); \
+    { 								\
+      yyerror ("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)				\
-    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
+# 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;
 #endif
 
-
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -738,30 +659,36 @@ do {						\
     YYFPRINTF Args;				\
 } while (0)
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
+# define YYDSYMPRINT(Args)			\
+do {						\
+  if (yydebug)					\
+    yysymprint Args;				\
+} while (0)
+
+# define YYDSYMPRINTF(Title, Token, Value, Location)		\
 do {								\
   if (yydebug)							\
     {								\
       YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr,					\
-                  Type, Value);	\
+      yysymprint (stderr, 					\
+                  Token, Value);	\
       YYFPRINTF (stderr, "\n");					\
     }								\
 } while (0)
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
+| TOP (cinluded).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (short *bottom, short *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+    short *bottom;
+    short *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -791,13 +718,13 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
-             yyrule - 1, yylno);
+  unsigned int yylineno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+             yyrule - 1, yylineno);
   /* 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)		\
@@ -811,7 +738,8 @@ do {					\
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -826,9 +754,13 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
+#if YYMAXDEPTH == 0
+# undef YYMAXDEPTH
+#endif
+
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -850,7 +782,7 @@ yystrlen (yystr)
      const char *yystr;
 #   endif
 {
-  const char *yys = yystr;
+  register const char *yys = yystr;
 
   while (*yys++ != '\0')
     continue;
@@ -875,8 +807,8 @@ yystpcpy (yydest, yysrc)
      const char *yysrc;
 #   endif
 {
-  char *yyd = yydest;
-  const char *yys = yysrc;
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -886,55 +818,7 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-# 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 */
+#endif /* !YYERROR_VERBOSE */
 
 
 
@@ -958,15 +842,15 @@ yysymprint (yyoutput, yytype, yyvaluep)
   (void) yyvaluep;
 
   if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+    {
+      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+    }
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
   switch (yytype)
     {
       default:
@@ -982,11 +866,10 @@ yysymprint (yyoutput, yytype, yyvaluep)
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
+yydestruct (yytype, yyvaluep)
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
@@ -994,10 +877,6 @@ yydestruct (yymsg, yytype, yyvaluep)
   /* Pacify ``unused variable'' warnings.  */
   (void) yyvaluep;
 
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
   switch (yytype)
     {
 
@@ -1025,10 +904,10 @@ int yyparse ();
 
 
 
-/* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1054,17 +933,17 @@ yyparse (void)
 #else
 int
 yyparse ()
-    ;
+
 #endif
 #endif
 {
   
-  int yystate;
-  int yyn;
+  register int yystate;
+  register int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
+  /* Lookahead token as an internal (translated) token number.  */
   int yytoken = 0;
 
   /* Three stacks and their tools:
@@ -1076,14 +955,14 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  short int *yyssp;
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+  register YYSTYPE *yyvsp;
 
 
 
@@ -1140,14 +1019,14 @@ yyparse ()
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
+	short *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 (YY_("memory exhausted"),
+	yyoverflow ("parser stack overflow",
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -1158,21 +1037,21 @@ yyparse ()
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
+      goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+	goto yyoverflowlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyexhaustedlab;
+	  goto yyoverflowlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -1204,18 +1083,18 @@ yyparse ()
 yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a look-ahead token if we need one and don't already have one.  */
+/* Read a lookahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1230,7 +1109,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1250,8 +1129,8 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the look-ahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  /* Shift the lookahead token.  */
+  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
@@ -1303,27 +1182,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;
@@ -1331,10 +1210,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;
@@ -1342,10 +1221,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;
@@ -1353,10 +1232,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;
@@ -1364,44 +1243,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
@@ -1419,165 +1298,164 @@ 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 1126 of yacc.c.  */
-#line 1581 "printrcy.c"
+/* Line 991 of yacc.c.  */
+#line 1458 "printrcy.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1616,153 +1494,104 @@ yyerrlab:
 
       if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
+	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
-	  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;
+	  char *yymsg;
+	  int yyx, yycount;
 
+	  yycount = 0;
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  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)
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		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)
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("syntax error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[yytype]);
+	  yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg != 0)
 	    {
-	      /* 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))
+	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[yytype]);
+
+	      if (yycount < 5)
 		{
-		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		    {
-		      yyp += yytnamerr (yyp, yyarg[yyi++]);
-		      yyf += 2;
-		    }
-		  else
-		    {
-		      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++;
+		      }
 		}
 	      yyerror (yymsg);
 	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    {
-	      yyerror (YY_("syntax error"));
-	      goto yyexhaustedlab;
-	    }
+	    yyerror ("syntax error; also virtual memory exhausted");
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror (YY_("syntax error"));
+	yyerror ("syntax error");
     }
 
 
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      if (yychar <= YYEOF)
+      /* Return failure if at end of input.  */
+      if (yychar == YYEOF)
         {
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
+	  /* 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;
         }
-      else
-	{
-	  yydestruct ("Error: discarding", yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+
+      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+      yydestruct (yytoken, &yylval);
+      yychar = YYEMPTY;
+
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
-  goto yyerrlab1;
+  goto yyerrlab2;
 
 
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
+/*----------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action.  |
+`----------------------------------------------------*/
+yyerrlab1:
 
-  /* 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;
+  /* 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
 
-yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
 
+  goto yyerrlab2;
 
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
+
+/*---------------------------------------------------------------.
+| yyerrlab2 -- pop states until the error token can be shifted.  |
+`---------------------------------------------------------------*/
+yyerrlab2:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1783,21 +1612,21 @@ yyerrlab1:
       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;
 
-  *++yyvsp = yylval;
+  YYDPRINTF ((stderr, "Shifting error token, "));
 
+  *++yyvsp = yylval;
 
-  /* Shift the error token. */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -1818,25 +1647,16 @@ yyabortlab:
   goto yyreturn;
 
 #ifndef yyoverflow
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
   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 a1ebec0..afa662b 100644
--- a/src/gutenprintui/printrcy.h
+++ b/src/gutenprintui/printrcy.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, 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,7 +69,6 @@
      pCURVE = 295
    };
 #endif
-/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 0c0cecb..0d5e20e 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -313,10 +313,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/gutenprintui2/gutenprintui2.pc.in b/src/gutenprintui2/gutenprintui2.pc.in
index 803aaae..afd0f00 100644
--- a/src/gutenprintui2/gutenprintui2.pc.in
+++ b/src/gutenprintui2/gutenprintui2.pc.in
@@ -7,5 +7,6 @@ Name: Gutenprint UI (GTK+-2.0 version)
 Description: Gutenprint Top Quality Printer Drivers - GTK+-2.0 User Interface
 Requires: gutenprint gtk+-2.0
 Version: @VERSION@
-Libs: -L${libdir} @gutenprintui2_libs@
+Libs: -L${libdir} @GUTENPRINTUI2_LIBS@
+Libs.private: @gutenprintui2_libdeps@
 Cflags: -I${includedir} @gutenprintui2_cflags@
diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c
index df2fdb6..1e20809 100644
--- a/src/gutenprintui2/panel.c
+++ b/src/gutenprintui2/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.7 2005/10/06 02:19:53 rlk Exp $"
+ * "$Id: panel.c,v 1.9 2005/12/30 20:32:07 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -884,10 +884,17 @@ populate_options(const stp_vars_t *v)
 }
 
 static void
+destroy_something(GtkWidget *widget, gpointer data)
+{
+  gtk_widget_destroy(widget);
+}
+
+static void
 populate_option_table(GtkWidget *table, int p_class)
 {
   int i, j;
   int current_pos = 0;
+  GtkWidget *previous_sep = NULL;
   int counts[STP_PARAMETER_LEVEL_INVALID][STP_PARAMETER_TYPE_INVALID];
   int vpos[STP_PARAMETER_LEVEL_INVALID][STP_PARAMETER_TYPE_INVALID];
   for (i = 0; i < STP_PARAMETER_LEVEL_INVALID; i++)
@@ -898,6 +905,8 @@ populate_option_table(GtkWidget *table, int p_class)
       }
 
 
+  gtk_container_foreach(GTK_CONTAINER(table), destroy_something, NULL);
+
   /* First scan the options to figure out where to start */
   for (i = 0; i < current_option_count; i++)
     {
@@ -926,26 +935,29 @@ populate_option_table(GtkWidget *table, int p_class)
     }
 
   /* Now, figure out where we're going to put the options */
-  for (i = 0; i < STP_PARAMETER_LEVEL_INVALID; i++)
+  for (i = 0; i <= MAXIMUM_PARAMETER_LEVEL + 1; i++)
     {
       int level_count = 0;
-      for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++)
-	level_count += counts[i][j];
+      if (i <= MAXIMUM_PARAMETER_LEVEL)
+	for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++)
+	  level_count += counts[i][j];
       if (level_count > 0 && current_pos > 0)
 	{
 	  GtkWidget *sep = gtk_hseparator_new();
 	  gtk_table_attach (GTK_TABLE(table), sep, 0, 4,
 			    current_pos, current_pos + 1,
 			    GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0);
-	  if (i <= MAXIMUM_PARAMETER_LEVEL)
-	    gtk_widget_show(sep);
+	  if (previous_sep)
+	    gtk_widget_show(previous_sep);
+	  previous_sep = sep;
 	  current_pos++;
 	}
-      for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++)
-	{
-	  vpos[i][j] = current_pos;
-	  current_pos += counts[i][j];
-	}
+      if (i <= MAXIMUM_PARAMETER_LEVEL)
+	for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++)
+	  {
+	    vpos[i][j] = current_pos;
+	    current_pos += counts[i][j];
+	  }
     }
 
   for (i = 0; i < current_option_count; i++)
diff --git a/src/gutenprintui2/printrcl.c b/src/gutenprintui2/printrcl.c
index 5cf2726..1c4d8e1 100644
--- a/src/gutenprintui2/printrcl.c
+++ b/src/gutenprintui2/printrcl.c
@@ -1,85 +1,32 @@
-
-#line 3 "printrcl.c"
-
-#define  YY_INT_ALIGNED short int
-
 /* 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 $
+ */
+
 #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. */
-
-/* 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)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
 #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
 
@@ -87,17 +34,34 @@ typedef unsigned int flex_uint32_t;
 
 #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
 
@@ -112,71 +76,71 @@ typedef unsigned int flex_uint32_t;
  * 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
 
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
+/* 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 yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
+		*yy_cp = yy_hold_char; \
 		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		yy_c_buf_p = yy_cp = yy_bp + n - 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).
  */
-
-#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;
@@ -213,16 +177,12 @@ 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
@@ -236,33 +196,23 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-
 	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-/* 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. */
+static YY_BUFFER_STATE yy_current_buffer = 0;
 
 /* 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_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
+#define YY_CURRENT_BUFFER yy_current_buffer
 
-/* 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. */
@@ -275,93 +225,69 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-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 yyrestart YY_PROTO(( FILE *input_file ));
 
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+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 )
 
-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  );
+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 ));
 
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+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 * ));
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_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; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_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; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
 
-#define yywrap(n) 1
-#define YY_SKIP_YYWRAP
 
+#define yywrap() 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 (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[]  );
+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[] ));
 
 /* 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 = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
+	yytext_ptr = yy_bp; \
+	yyleng = (int) (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
-/* 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] =
+static yyconst short int yy_accept[335] =
     {   0,
         0,    0,   41,   40,   37,   39,   40,   38,   40,   40,
        31,   35,   35,   35,   35,   35,   35,   35,   35,   35,
@@ -402,7 +328,7 @@ static yyconst flex_int16_t yy_accept[335] =
         0,    2,   18,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -434,7 +360,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[39] =
+static yyconst int yy_meta[39] =
     {   0,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    3,
         3,    1,    3,    3,    3,    3,    3,    3,    3,    3,
@@ -442,7 +368,7 @@ static yyconst flex_int32_t yy_meta[39] =
         3,    3,    3,    3,    3,    3,    3,    3
     } ;
 
-static yyconst flex_int16_t yy_base[340] =
+static yyconst short int yy_base[340] =
     {   0,
         0,    0,  374,  375,  371,  375,  368,  343,  364,   29,
        32,  336,  341,   18,   26,   21,   32,  343,    0,  340,
@@ -483,7 +409,7 @@ static yyconst flex_int16_t yy_base[340] =
        81,  375,  375,  375,   94,   97,  100,   89,  103
     } ;
 
-static yyconst flex_int16_t yy_def[340] =
+static yyconst short int yy_def[340] =
     {   0,
       334,    1,  334,  334,  334,  334,  335,  336,  337,  334,
       334,  338,  338,  338,  338,  338,  338,  338,  338,  338,
@@ -524,7 +450,7 @@ static yyconst flex_int16_t yy_def[340] =
       334,  334,  334,    0,  334,  334,  334,  334,  334
     } ;
 
-static yyconst flex_int16_t yy_nxt[414] =
+static yyconst short int yy_nxt[414] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        11,    4,    4,   12,   13,   14,   15,   16,   17,   18,
@@ -574,7 +500,7 @@ static yyconst flex_int16_t yy_nxt[414] =
       334,  334,  334
     } ;
 
-static yyconst flex_int16_t yy_chk[414] =
+static yyconst short int yy_chk[414] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -627,9 +553,6 @@ static yyconst flex_int16_t 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.
  */
@@ -639,6 +562,7 @@ int yy_flex_debug = 0;
 #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 $"
  *
@@ -697,21 +621,7 @@ q_strdup(const char *s)
     return g_strndup(s + 1, strlen(s) - 2);
 }
 
-#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
+#line 625 "printrcl.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -719,30 +629,65 @@ q_strdup(const char *s)
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap YY_PROTO(( void ));
 #else
-extern int yywrap (void );
+extern int yywrap YY_PROTO(( void ));
 #endif
 #endif
 
-    static void yyunput (int c,char *buf_ptr  );
-    
+#ifndef YY_NO_UNPUT
+static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+#endif
+
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput YY_PROTO(( void ));
 #else
-static int input (void );
+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
 
+#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. */
@@ -751,6 +696,7 @@ static int input (void );
 #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().
@@ -763,10 +709,9 @@ static int input (void );
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+	if ( yy_current_buffer->yy_is_interactive ) \
 		{ \
-		int c = '*'; \
-		size_t n; \
+		int c = '*', n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -776,22 +721,9 @@ static int input (void );
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	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); \
-			} \
-		}\
-\
-
+	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+		  && ferror( yyin ) ) \
+		YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -812,18 +744,12 @@ static int input (void );
 #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_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
+#define YY_DECL int yylex YY_PROTO(( void ))
+#endif
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -840,29 +766,27 @@ extern int yylex (void);
 #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 855 "printrcl.c"
+#line 779 "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;
@@ -870,36 +794,34 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
+		if ( ! yy_current_buffer )
+			yy_current_buffer =
+				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 )
 				{
@@ -916,22 +838,24 @@ 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:
@@ -1095,7 +1019,6 @@ 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;
@@ -1111,7 +1034,6 @@ 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;
@@ -1127,7 +1049,6 @@ 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++;
@@ -1137,33 +1058,33 @@ YY_RULE_SETUP
 #line 116 "printrcl.l"
 ECHO;
 	YY_BREAK
-#line 1141 "printrcl.c"
+#line 1062 "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_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+		if ( yy_current_buffer->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_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			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;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1173,13 +1094,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_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p <= &yy_current_buffer->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
@@ -1192,30 +1113,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
@@ -1226,7 +1147,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;
@@ -1234,30 +1155,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_LVALUE->yy_ch_buf[(yy_n_chars)];
+				yy_c_buf_p =
+				&yy_current_buffer->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;
@@ -1268,7 +1189,8 @@ 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
  *
@@ -1277,20 +1199,21 @@ 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 (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
+
+static int yy_get_next_buffer()
+	{
+	register char *dest = yy_current_buffer->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_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+	if ( yy_current_buffer->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.
@@ -1310,30 +1233,34 @@ static int yy_get_next_buffer (void)
 	/* 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_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( yy_current_buffer->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_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
 
 	else
 		{
-			size_t num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+		int num_to_read =
+			yy_current_buffer->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 )
 				{
@@ -1346,7 +1273,8 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yy_flex_realloc( (void *) b->yy_ch_buf,
+							 b->yy_buf_size + 2 );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1356,35 +1284,35 @@ static int yy_get_next_buffer (void)
 				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_LVALUE->yy_buf_size -
+			num_to_read = yy_current_buffer->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_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
+			yy_n_chars, num_to_read );
 
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		yy_current_buffer->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_LVALUE->yy_buffer_status =
+			yy_current_buffer->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1392,31 +1320,32 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	(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;
+	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;
 
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+	yytext_ptr = &yy_current_buffer->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 (void)
-{
+static yy_state_type yy_get_previous_state()
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
 
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+	yy_current_state = yy_start;
+
+	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 )
 			{
@@ -1428,23 +1357,30 @@ static int yy_get_next_buffer (void)
 		}
 
 	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 );
  */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_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
+	{
 	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 )
 		{
@@ -1456,73 +1392,80 @@ static int yy_get_next_buffer (void)
 	yy_is_jam = (yy_current_state == 334);
 
 	return yy_is_jam ? 0 : yy_current_state;
-}
+	}
 
-    static void yyunput (int c, register char * yy_bp )
-{
-	register char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
+
+#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;
 
 	/* undo effects of setting up yytext */
-	*yy_cp = (yy_hold_char);
+	*yy_cp = yy_hold_char;
 
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+	if ( yy_cp < yy_current_buffer->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_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		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 char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+				&yy_current_buffer->yy_ch_buf[number_to_move];
 
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+		while ( source > yy_current_buffer->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+		yy_current_buffer->yy_n_chars =
+			yy_n_chars = yy_current_buffer->yy_buf_size;
 
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		if ( yy_cp < yy_current_buffer->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;
-}
 
-#ifndef YY_NO_INPUT
+	yytext_ptr = yy_bp;
+	yy_hold_char = *yy_cp;
+	yy_c_buf_p = yy_cp;
+	}
+#endif	/* ifndef YY_NO_UNPUT */
+
+
 #ifdef __cplusplus
-    static int yyinput (void)
+static int yyinput()
 #else
-    static int input  (void)
+static int input()
 #endif
-
-{
+	{
 	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+	*yy_c_buf_p = yy_hold_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_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p < &yy_current_buffer->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()
@@ -1536,16 +1479,16 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					yyrestart(yyin );
+					yyrestart( yyin );
 
-					/*FALLTHROUGH*/
+					/* fall through */
 
 				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();
@@ -1555,92 +1498,90 @@ static int yy_get_next_buffer (void)
 					}
 
 				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;
-}
-#endif	/* ifndef YY_NO_INPUT */
+	}
 
-/** 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 );
+
+#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 );
+
+	yy_init_buffer( yy_current_buffer, input_file );
+	yy_load_buffer_state();
 	}
 
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
 
-/** 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 )
+#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 )
 		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_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		*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_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
+	yy_current_buffer = 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;
-}
+	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);
-}
 
-/** 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 )
-{
+#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;
+	}
+
+
+#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
+	{
 	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1649,75 +1590,80 @@ static void yy_load_buffer_state  (void)
 	/* 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 *) yyalloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yy_flex_alloc( 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;
-}
+	}
 
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
+
+#ifdef YY_USE_PROTOS
+void yy_delete_buffer( YY_BUFFER_STATE b )
+#else
+void yy_delete_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+	{
 	if ( ! b )
 		return;
 
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+	if ( b == yy_current_buffer )
+		yy_current_buffer = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
+		yy_flex_free( (void *) b->yy_ch_buf );
 
-	yyfree((void *) b  );
-}
+	yy_flex_free( (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 )
 
-{
-	int oerrno = errno;
-    
-	yy_flush_buffer(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
+
+
+	{
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* 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 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
+	}
 
-/** 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 )
+
+#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 )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1734,121 +1680,29 @@ extern int isatty (int );
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	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;
+	if ( b == yy_current_buffer )
+		yy_load_buffer_state();
 	}
 
-	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 )
-{
+#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 ( 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) yyalloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -1862,43 +1716,47 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, 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
 
-/** 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) );
-}
 
-/** 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 )
-{
+#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
+
+
+#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
+	{
 	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 *) yyalloc(n  );
+	buf = (char *) yy_flex_alloc( n );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -1907,7 +1765,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, 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()" );
 
@@ -1917,164 +1775,148 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
 	b->yy_is_our_buffer = 1;
 
 	return b;
-}
+	}
+#endif
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
+
+#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;
 #endif
+	{
+	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+		{
+		yy_size_t new_size;
 
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
+		yy_start_stack_depth += YY_START_STACK_INCR;
+		new_size = yy_start_stack_depth * sizeof( int );
 
-/* Redefine yyless() so it works in section 3 code. */
+		if ( ! yy_start_stack )
+			yy_start_stack = (int *) yy_flex_alloc( 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 )
+		else
+			yy_start_stack = (int *) yy_flex_realloc(
+					(void *) yy_start_stack, new_size );
 
-/* Accessor  methods (get/set functions) to struct members. */
+		if ( ! yy_start_stack )
+			YY_FATAL_ERROR(
+			"out of memory expanding start-condition stack" );
+		}
 
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
+	yy_start_stack[yy_start_stack_ptr++] = YY_START;
 
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
+	BEGIN(new_state);
+	}
+#endif
 
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
 
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
+#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 current token.
- * 
- */
+	BEGIN(yy_start_stack[yy_start_stack_ptr]);
+	}
+#endif
 
-char *yyget_text  (void)
-{
-        return yytext;
-}
 
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state()
+	{
+	return yy_start_stack[yy_start_stack_ptr - 1];
+	}
+#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 ;
-}
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
 
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_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 );
+	}
 
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
 
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
 
-/* 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();
-	}
+/* Redefine yyless() so it works in section 3 code. */
 
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
+#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 )
 
-    return 0;
-}
 
-/*
- * Internal utility routines.
- */
+/* Internal utility routines. */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
+#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
+	{
 	register int i;
-    	for ( i = 0; i < n; ++i )
+	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-}
+	}
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
+#ifdef YY_USE_PROTOS
+static int yy_flex_strlen( yyconst char *s )
+#else
+static int yy_flex_strlen( s )
+yyconst char *s;
+#endif
+	{
 	register int n;
-    	for ( n = 0; s[n]; ++n )
+	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-}
+	}
 #endif
 
-void *yyalloc (yy_size_t  size )
-{
+
+#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
+	{
 	return (void *) malloc( size );
-}
+	}
 
-void *yyrealloc  (void * ptr, yy_size_t  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
+	{
 	/* 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
@@ -2083,25 +1925,23 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#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_USE_PROTOS
+static void yy_flex_free( void *ptr )
+#else
+static void yy_flex_free( ptr )
+void *ptr;
+#endif
+	{
+	free( ptr );
+	}
 
-#ifdef YY_DECL_IS_OURS
-#undef YY_DECL_IS_OURS
-#undef YY_DECL
+#if YY_MAIN
+int main()
+	{
+	yylex();
+	return 0;
+	}
 #endif
 #line 116 "printrcl.l"
diff --git a/src/gutenprintui2/printrcy.c b/src/gutenprintui2/printrcy.c
index c1f0cbe..0c96062 100644
--- a/src/gutenprintui2/printrcy.c
+++ b/src/gutenprintui2/printrcy.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, 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,9 +36,6 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
-/* Bison version.  */
-#define YYBISON_VERSION "2.1"
-
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -96,7 +93,6 @@
      pCURVE = 295
    };
 #endif
-/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
@@ -187,11 +183,6 @@ 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 */
@@ -204,48 +195,22 @@ typedef int YYSTYPE;
 /* Copy the second part of user declarations.  */
 
 
-/* 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
+/* Line 214 of yacc.c.  */
+#line 199 "printrcy.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   else
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
+# else
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
 #    define YYSTACK_ALLOC alloca
-#    if defined (__STDC__) || defined (__cplusplus)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     define YYINCLUDED_STDLIB_H
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
 #    endif
 #   endif
 #  endif
@@ -254,51 +219,25 @@ 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
-#  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
-}
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
 #  endif
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+	 || (YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  short yyss;
   YYSTYPE yyvs;
   };
 
@@ -308,20 +247,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 int) + sizeof (YYSTYPE))			\
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  YYSIZE_T yyi;				\
+	  register YYSIZE_T yyi;		\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
@@ -350,7 +289,7 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short int yysigned_char;
+   typedef short yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
@@ -371,7 +310,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.  */
@@ -450,7 +389,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const unsigned short yyrline[] =
 {
        0,   100,   100,   111,   118,   128,   138,   148,   158,   164,
      168,   172,   176,   180,   184,   188,   206,   210,   214,   217,
@@ -463,37 +402,37 @@ static const unsigned short int yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[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 int yytoknum[] =
+static const unsigned short yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -634,6 +573,22 @@ 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)
@@ -641,8 +596,7 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
+#define YYERROR		goto yyerrlab1
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -663,59 +617,26 @@ do								\
       goto yybackup;						\
     }								\
   else								\
-    {								\
-      yyerror (YY_("syntax error: cannot back up")); \
+    { 								\
+      yyerror ("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)				\
-    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
+# 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;
 #endif
 
-
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -738,30 +659,36 @@ do {						\
     YYFPRINTF Args;				\
 } while (0)
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
+# define YYDSYMPRINT(Args)			\
+do {						\
+  if (yydebug)					\
+    yysymprint Args;				\
+} while (0)
+
+# define YYDSYMPRINTF(Title, Token, Value, Location)		\
 do {								\
   if (yydebug)							\
     {								\
       YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr,					\
-                  Type, Value);	\
+      yysymprint (stderr, 					\
+                  Token, Value);	\
       YYFPRINTF (stderr, "\n");					\
     }								\
 } while (0)
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
+| TOP (cinluded).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (short *bottom, short *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+    short *bottom;
+    short *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -791,13 +718,13 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
-             yyrule - 1, yylno);
+  unsigned int yylineno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+             yyrule - 1, yylineno);
   /* 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)		\
@@ -811,7 +738,8 @@ do {					\
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -826,9 +754,13 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
+#if YYMAXDEPTH == 0
+# undef YYMAXDEPTH
+#endif
+
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -850,7 +782,7 @@ yystrlen (yystr)
      const char *yystr;
 #   endif
 {
-  const char *yys = yystr;
+  register const char *yys = yystr;
 
   while (*yys++ != '\0')
     continue;
@@ -875,8 +807,8 @@ yystpcpy (yydest, yysrc)
      const char *yysrc;
 #   endif
 {
-  char *yyd = yydest;
-  const char *yys = yysrc;
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -886,55 +818,7 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-# 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 */
+#endif /* !YYERROR_VERBOSE */
 
 
 
@@ -958,15 +842,15 @@ yysymprint (yyoutput, yytype, yyvaluep)
   (void) yyvaluep;
 
   if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+    {
+      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+    }
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
   switch (yytype)
     {
       default:
@@ -982,11 +866,10 @@ yysymprint (yyoutput, yytype, yyvaluep)
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
+yydestruct (yytype, yyvaluep)
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
@@ -994,10 +877,6 @@ yydestruct (yymsg, yytype, yyvaluep)
   /* Pacify ``unused variable'' warnings.  */
   (void) yyvaluep;
 
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
   switch (yytype)
     {
 
@@ -1025,10 +904,10 @@ int yyparse ();
 
 
 
-/* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1054,17 +933,17 @@ yyparse (void)
 #else
 int
 yyparse ()
-    ;
+
 #endif
 #endif
 {
   
-  int yystate;
-  int yyn;
+  register int yystate;
+  register int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
+  /* Lookahead token as an internal (translated) token number.  */
   int yytoken = 0;
 
   /* Three stacks and their tools:
@@ -1076,14 +955,14 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  short int *yyssp;
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+  register YYSTYPE *yyvsp;
 
 
 
@@ -1140,14 +1019,14 @@ yyparse ()
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
+	short *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 (YY_("memory exhausted"),
+	yyoverflow ("parser stack overflow",
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -1158,21 +1037,21 @@ yyparse ()
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
+      goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+	goto yyoverflowlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyexhaustedlab;
+	  goto yyoverflowlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -1204,18 +1083,18 @@ yyparse ()
 yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a look-ahead token if we need one and don't already have one.  */
+/* Read a lookahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1230,7 +1109,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1250,8 +1129,8 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the look-ahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  /* Shift the lookahead token.  */
+  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
@@ -1303,27 +1182,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;
@@ -1331,10 +1210,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;
@@ -1342,10 +1221,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;
@@ -1353,10 +1232,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;
@@ -1364,44 +1243,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
@@ -1419,165 +1298,164 @@ 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 1126 of yacc.c.  */
-#line 1581 "printrcy.c"
+/* Line 991 of yacc.c.  */
+#line 1458 "printrcy.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1616,153 +1494,104 @@ yyerrlab:
 
       if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
+	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
-	  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;
+	  char *yymsg;
+	  int yyx, yycount;
 
+	  yycount = 0;
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  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)
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		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)
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("syntax error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[yytype]);
+	  yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg != 0)
 	    {
-	      /* 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))
+	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[yytype]);
+
+	      if (yycount < 5)
 		{
-		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		    {
-		      yyp += yytnamerr (yyp, yyarg[yyi++]);
-		      yyf += 2;
-		    }
-		  else
-		    {
-		      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++;
+		      }
 		}
 	      yyerror (yymsg);
 	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    {
-	      yyerror (YY_("syntax error"));
-	      goto yyexhaustedlab;
-	    }
+	    yyerror ("syntax error; also virtual memory exhausted");
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror (YY_("syntax error"));
+	yyerror ("syntax error");
     }
 
 
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      if (yychar <= YYEOF)
+      /* Return failure if at end of input.  */
+      if (yychar == YYEOF)
         {
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
+	  /* 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;
         }
-      else
-	{
-	  yydestruct ("Error: discarding", yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+
+      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+      yydestruct (yytoken, &yylval);
+      yychar = YYEMPTY;
+
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
-  goto yyerrlab1;
+  goto yyerrlab2;
 
 
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
+/*----------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action.  |
+`----------------------------------------------------*/
+yyerrlab1:
 
-  /* 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;
+  /* 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
 
-yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
 
+  goto yyerrlab2;
 
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
+
+/*---------------------------------------------------------------.
+| yyerrlab2 -- pop states until the error token can be shifted.  |
+`---------------------------------------------------------------*/
+yyerrlab2:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1783,21 +1612,21 @@ yyerrlab1:
       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;
 
-  *++yyvsp = yylval;
+  YYDPRINTF ((stderr, "Shifting error token, "));
 
+  *++yyvsp = yylval;
 
-  /* Shift the error token. */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -1818,25 +1647,16 @@ yyabortlab:
   goto yyreturn;
 
 #ifndef yyoverflow
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
   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 a1ebec0..afa662b 100644
--- a/src/gutenprintui2/printrcy.h
+++ b/src/gutenprintui2/printrcy.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, 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,7 +69,6 @@
      pCURVE = 295
    };
 #endif
-/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 7fe8e15..d4191c1 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -383,10 +383,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/main/dither-main.c b/src/main/dither-main.c
index a5aadb6..62d6082 100644
--- a/src/main/dither-main.c
+++ b/src/main/dither-main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dither-main.c,v 1.50 2005/04/12 00:57:01 rlk Exp $"
+ * "$Id: dither-main.c,v 1.51 2005/12/29 04:07:46 rlk Exp $"
  *
  *   Dither routine entrypoints
  *
@@ -139,32 +139,19 @@ stp_dither_describe_parameter(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "DitherAlgorithm") == 0)
     {
       stp_fill_parameter_settings(description, &(dither_parameters[1]));
-      if (stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE) &&
-	  stpi_get_quality_by_name(stp_get_string_parameter(v, "Quality")))
-	description->is_active = 0;
-      else
+      description->bounds.str = stp_string_list_create();
+      for (i = 0; i < num_dither_algos; i++)
 	{
-	  description->bounds.str = stp_string_list_create();
-	  for (i = 0; i < num_dither_algos; i++)
-	    {
-	      const stpi_dither_algorithm_t *dt = &dither_algos[i];
-	      if (dt->id != D_INVALID)
-		stp_string_list_add_string(description->bounds.str,
-					   dt->name, dt->text);
-	    }
-	  description->deflt.str =
-	    stp_string_list_param(description->bounds.str, 0)->name;
+	  const stpi_dither_algorithm_t *dt = &dither_algos[i];
+	  if (dt->id != D_INVALID)
+	    stp_string_list_add_string(description->bounds.str,
+				       dt->name, dt->text);
 	}
+      description->deflt.str =
+	stp_string_list_param(description->bounds.str, 0)->name;
     }
   else
     return;
-  if (stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE) &&
-      stpi_get_quality_by_name(stp_get_string_parameter(v, "Quality")))
-    description->is_active = 0;
-  else if (stp_check_string_parameter(v, "ImageType", STP_PARAMETER_ACTIVE) &&
-	   strcmp(stp_get_string_parameter(v, "ImageType"), "None") != 0 &&
-	   description->p_level > STP_PARAMETER_LEVEL_BASIC)
-    description->is_active = 0;
 }
 
 #define RETURN_DITHERFUNC(func, v)					\
@@ -180,24 +167,37 @@ stpi_set_dither_function(stp_vars_t *v)
   const stpi_quality_t *quality = NULL;
   const char *image_type = stp_get_string_parameter(v, "ImageType");
   const char *color_correction = stp_get_string_parameter(v,"ColorCorrection");
+  const char *algorithm = stp_get_string_parameter(v, "DitherAlgorithm");
   stpi_dither_t *d = (stpi_dither_t *) stp_get_component_data(v, "Dither");
   int i;
-  const char *algorithm = stp_get_string_parameter(v, "DitherAlgorithm");
   d->stpi_dither_type = -1;
   if (stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE))
     quality = stpi_get_quality_by_name(stp_get_string_parameter(v, "Quality"));
 
-  if (color_correction)
+  if (color_correction && strcmp(color_correction, "Predithered") == 0)
+    d->stpi_dither_type = D_PREDITHERED;
+  else if (algorithm && strcmp(algorithm, "None") != 0)
     {
-      if (strcmp(color_correction, "Predithered") == 0)
-	d->stpi_dither_type = D_PREDITHERED;
-    }
-  if (image_type && d->stpi_dither_type == -1)
-    {
-      if (strcmp(image_type, "Text") == 0)
-	d->stpi_dither_type = D_VERY_FAST;
+      for (i = 0; i < num_dither_algos; i++)
+	{
+	  if (!strcmp(algorithm, _(dither_algos[i].name)))
+	    {
+	      d->stpi_dither_type = dither_algos[i].id;
+	      break;
+	    }
+	}
+      if (d->stpi_dither_type == -1)
+	{
+	  d->stpi_dither_type = D_EVENTONE;
+	  /* EvenTone performs poorly if the aspect ratio is greater than 2 */
+	  if ((d->stpi_dither_type & (D_EVENTONE | D_UNITONE)) &&
+	      (d->x_aspect > 2 || d->y_aspect > 2))
+	    d->stpi_dither_type = D_ADAPTIVE_HYBRID;
+	}	
     }
-  if (quality && d->stpi_dither_type == -1)
+  else if (image_type && strcmp(image_type, "Text") == 0)
+    d->stpi_dither_type = D_VERY_FAST;
+  else if (quality)
     {
       switch (quality->quality_level)
 	{
@@ -249,25 +249,6 @@ stpi_set_dither_function(stp_vars_t *v)
 	  (d->x_aspect > 2 || d->y_aspect > 2))
 	d->stpi_dither_type = D_ADAPTIVE_HYBRID;
     }
-  else if (algorithm)
-    {
-      for (i = 0; i < num_dither_algos; i++)
-	{
-	  if (!strcmp(algorithm, _(dither_algos[i].name)))
-	    {
-	      d->stpi_dither_type = dither_algos[i].id;
-	      break;
-	    }
-	}
-      if (d->stpi_dither_type == -1)
-	{
-	  d->stpi_dither_type = D_EVENTONE;
-	  /* EvenTone performs poorly if the aspect ratio is greater than 2 */
-	  if ((d->stpi_dither_type & (D_EVENTONE | D_UNITONE)) &&
-	      (d->x_aspect > 2 || d->y_aspect > 2))
-	    d->stpi_dither_type = D_ADAPTIVE_HYBRID;
-	}	
-    }
   switch (d->stpi_dither_type)
     {
     case D_PREDITHERED:
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 15392c2..30636da 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.58 2005/10/29 21:31:19 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.60 2006/01/06 22:10:41 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -192,6 +192,96 @@ static hue_curve_t r800_blue_curve =
   "</gutenprint>\n"
 };
 
+static hue_curve_t picturemate_cyan_curve =
+{
+  "CyanCurve",
+  "<?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.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* B */
+  /* B */  "1.000 0.875 0.700 0.550 0.400 0.300 0.200 0.100 "  /* M */
+  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
+  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
+  /* Y */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* G */
+  /* G */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* C */
+  "</sequence>\n"
+  "</curve>\n"
+  "</gutenprint>\n"
+};
+
+static hue_curve_t picturemate_magenta_curve =
+{
+  "CyanCurve",
+  "<?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.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
+  /* B */  "0.000 0.000 0.000 0.002 0.050 0.300 0.600 0.800 "  /* M */
+  /* M */  "1.000 1.000 0.850 0.700 0.600 0.500 0.400 0.300 "  /* R */
+  /* R */  "0.200 0.100 0.050 0.000 0.000 0.000 0.000 0.000 "  /* Y */
+  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
+  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
+  "</sequence>\n"
+  "</curve>\n"
+  "</gutenprint>\n"
+};
+
+static hue_curve_t picturemate_yellow_curve =
+{
+  "CyanCurve",
+  "<?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.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
+  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
+  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.050 0.150 "  /* R */
+  /* R */  "0.250 0.350 0.450 0.550 0.650 0.750 0.850 0.950 "  /* Y */
+  /* Y */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* G */
+  /* G */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* C */
+  "</sequence>\n"
+  "</curve>\n"
+  "</gutenprint>\n"
+};
+
+static hue_curve_t picturemate_red_curve =
+{
+  "CyanCurve",
+  "<?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.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
+  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
+  /* M */  "0.025 0.400 0.600 0.750 0.890 1.000 1.000 1.000 "  /* R */
+  /* R */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* Y */
+  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
+  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
+  "</sequence>\n"
+  "</curve>\n"
+  "</gutenprint>\n"
+};
+
+static hue_curve_t picturemate_blue_curve =
+{
+  "CyanCurve",
+  "<?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.000 0.250 0.475 0.700 0.810 0.875 0.940 1.000 "  /* B */
+  /* B */  "1.000 0.975 0.930 0.875 0.810 0.740 0.650 0.400 "  /* M */
+  /* M */  "0.040 0.002 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
+  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
+  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
+  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
+  "</sequence>\n"
+  "</curve>\n"
+  "</gutenprint>\n"
+};
+
 
 static const physical_subchannel_t standard_black_subchannels[] =
 {
@@ -249,6 +339,13 @@ static const physical_subchannel_t r800_cyan_subchannels[] =
 
 DECLARE_EXTENDED_INK_CHANNEL(r800_cyan);
 
+static const physical_subchannel_t picturemate_cyan_subchannels[] =
+{
+  { 2, -1, 0, "CyanDensity", NULL }
+};
+
+DECLARE_EXTENDED_INK_CHANNEL(picturemate_cyan);
+
 static const physical_subchannel_t cx3650_standard_cyan_subchannels[] =
 {
   { 2, -1, 2, "CyanDensity", NULL }
@@ -291,6 +388,13 @@ static const physical_subchannel_t r800_magenta_subchannels[] =
 
 DECLARE_EXTENDED_INK_CHANNEL(r800_magenta);
 
+static const physical_subchannel_t picturemate_magenta_subchannels[] =
+{
+  { 1, -1, 0, "MagentaDensity", NULL }
+};
+
+DECLARE_EXTENDED_INK_CHANNEL(picturemate_magenta);
+
 static const physical_subchannel_t f360_standard_magenta_subchannels[] =
 {
   { 1, -1, 1, "MagentaDensity", NULL }
@@ -361,6 +465,13 @@ static const physical_subchannel_t r800_yellow_subchannels[] =
 
 DECLARE_EXTENDED_INK_CHANNEL(r800_yellow);
 
+static const physical_subchannel_t picturemate_yellow_subchannels[] =
+{
+  { 4, -1, 0, "YellowDensity", NULL }
+};
+
+DECLARE_EXTENDED_INK_CHANNEL(picturemate_yellow);
+
 static const physical_subchannel_t r800_red_subchannels[] =
 {
   { 7, -1, 0, "RedDensity", NULL }
@@ -368,6 +479,13 @@ static const physical_subchannel_t r800_red_subchannels[] =
 
 DECLARE_EXTENDED_INK_CHANNEL(r800_red);
 
+static const physical_subchannel_t picturemate_red_subchannels[] =
+{
+  { 7, -1, 0, "RedDensity", NULL }
+};
+
+DECLARE_EXTENDED_INK_CHANNEL(picturemate_red);
+
 static const physical_subchannel_t r800_blue_subchannels[] =
 {
   { 8, -1, 1, "BlueDensity", NULL }
@@ -375,6 +493,13 @@ static const physical_subchannel_t r800_blue_subchannels[] =
 
 DECLARE_EXTENDED_INK_CHANNEL(r800_blue);
 
+static const physical_subchannel_t picturemate_blue_subchannels[] =
+{
+  { 8, -1, 1, "BlueDensity", NULL }
+};
+
+DECLARE_EXTENDED_INK_CHANNEL(picturemate_blue);
+
 static const physical_subchannel_t standard_gloss_subchannels[] =
 {
   { 9, -1, 0, "GlossDensity", NULL }
@@ -1506,6 +1631,21 @@ static const escp2_inkname_t six_color_r800_photo_inkset =
   &six_color_r800_photo_channel_set
 };
 
+static const ink_channel_t *const six_color_picturemate_channels[] =
+{
+  &photo_black_channel, &picturemate_cyan_channel,
+  &picturemate_magenta_channel, &picturemate_yellow_channel,
+  &picturemate_red_channel, &picturemate_blue_channel
+};
+
+DECLARE_CHANNEL_SET(six_color_picturemate);
+
+static const escp2_inkname_t six_color_picturemate_inkset =
+{
+  "CMYKRB", N_("Six Color Photo"), INKSET_CMYKRB,
+  &six_color_picturemate_channel_set
+};
+
 static const ink_channel_t *const six_color_r800_photo_gloss_channels[] =
 {
   &f360_photo_black_channel, &f360_standard_cyan_channel,
@@ -1796,6 +1936,12 @@ static const escp2_inkname_t six_color_r800_extended_inkset =
   &six_color_r800_channel_set
 };
 
+static const escp2_inkname_t six_color_picturemate_extended_inkset =
+{
+  "PhysicalCMYKRB", N_("Six Color Raw"), INKSET_EXTENDED,
+  &six_color_picturemate_channel_set
+};
+
 static const ink_channel_t *const f360_six_color_extended_channels[] =
 {
   &standard_black_channel,
@@ -2326,6 +2472,15 @@ static const escp2_inkname_t *const cmykrb_photo_ink_types[] =
 DECLARE_INKLIST("cmykrbphoto", cmykrb_photo, cmykrb_photo,
 		N_("Photo Black"), r800, r800_photo, standard);
 
+static const escp2_inkname_t *const picturemate_photo_ink_types[] =
+{
+  &six_color_picturemate_inkset,
+  &six_color_picturemate_extended_inkset,
+};
+
+DECLARE_INKLIST("picturemate", picturemate, picturemate_photo,
+		N_("Standard"), picturemate, picturemate, standard);
+
 
 #define DECLARE_INKGROUP(name)			\
 const inkgroup_t stpi_escp2_##name##_inkgroup =	\
@@ -2473,3 +2628,10 @@ static const inklist_t *const cmykrb_group[] =
 };
 
 DECLARE_INKGROUP(cmykrb);
+
+static const inklist_t *const picturemate_group[] =
+{
+  &picturemate_inklist,
+};
+
+DECLARE_INKGROUP(picturemate);
diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c
index d64ecf2..a680048 100644
--- a/src/main/escp2-driver.c
+++ b/src/main/escp2-driver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-driver.c,v 1.25 2005/04/17 23:13:59 rlk Exp $"
+ * "$Id: escp2-driver.c,v 1.27 2006/01/06 22:10:41 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -101,6 +101,8 @@ print_debug_params(stp_vars_t *v)
   print_remote_int_param(v, "Model", stp_get_model_id(v));
   print_remote_int_param(v, "Ydpi", pd->res->vres);
   print_remote_int_param(v, "Xdpi", pd->res->hres);
+  print_remote_int_param(v, "Printed_ydpi", pd->res->printed_vres);
+  print_remote_int_param(v, "Printed_xdpi", pd->res->printed_hres);
   print_remote_int_param(v, "Use_softweave", pd->res->softweave);
   print_remote_int_param(v, "Use_printer_weave", pd->res->printer_weave);
   print_remote_int_param(v, "Use_printer_weave", pd->use_printer_weave);
@@ -427,7 +429,7 @@ set_vertical_position(stp_vars_t *v, stp_pass_t *pass)
   escp2_privdata_t *pd = get_privdata(v);
   int advance = pass->logicalpassstart - pd->last_pass_offset -
     (pd->separation_rows - 1);
-  advance = advance * pd->vertical_units / pd->res->vres;
+  advance = advance * pd->vertical_units / pd->res->printed_vres;
   if (pass->logicalpassstart > pd->last_pass_offset ||
       (pd->send_zero_pass_advance && pass->pass > pd->last_pass) ||
       pd->printing_initial_vertical_offset != 0)
diff --git a/src/main/escp2-inks.c b/src/main/escp2-inks.c
index eaffd03..6a5ee2e 100644
--- a/src/main/escp2-inks.c
+++ b/src/main/escp2-inks.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-inks.c,v 1.42 2005/10/23 19:43:14 rlk Exp $"
+ * "$Id: escp2-inks.c,v 1.46 2006/01/07 02:43:28 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -115,6 +115,14 @@ static const escp2_dropsize_t escp2_1_5pl_2880_2880_dropsizes =
 static const escp2_dropsize_t escp2_1_5pl_5760_dropsizes =
   { "1_5pl_5760", 1, { 1.0 } };
 
+/* E-100/Picturemate */
+static const escp2_dropsize_t escp2_picturemate_1440_dropsizes =
+  { "picturemate_1440", 3, { 0.4, 0.65, 1.0 } };
+static const escp2_dropsize_t escp2_picturemate_2880_dropsizes =
+  { "picturemate_2880", 2, { 0.615, 1.0 } };
+static const escp2_dropsize_t escp2_picturemate_5760_dropsizes =
+  { "picturemate_5760", 1, { 1.0 } };
+
 /* Stylus Photo R300 */
 static const escp2_dropsize_t escp2_r300_360_dropsizes =
   { "r300_360", 3, { 0.15, 0.3, 1.0 } };
@@ -131,11 +139,11 @@ static const escp2_dropsize_t escp2_r300_2880_1440_dropsizes =
 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 } };
+  { "r2400_720", 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 } };
+  { "r2400_2880", 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 =
@@ -302,6 +310,19 @@ const escp2_drop_list_t stpi_escp2_variable_r2400_drops =
   &escp2_r2400_2880_2880_dropsizes,
 };
 
+const escp2_drop_list_t stpi_escp2_variable_picturemate_drops =
+{
+  &escp2_picturemate_1440_dropsizes,
+  &escp2_picturemate_1440_dropsizes,
+  &escp2_picturemate_1440_dropsizes,
+  &escp2_picturemate_1440_dropsizes,
+  &escp2_picturemate_1440_dropsizes,
+  &escp2_picturemate_1440_dropsizes,
+  &escp2_picturemate_2880_dropsizes,
+  &escp2_picturemate_5760_dropsizes,
+  &escp2_picturemate_5760_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 3980be0..9796ac7 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-papers.c,v 1.84 2005/10/30 00:57:40 rlk Exp $"
+ * "$Id: escp2-papers.c,v 1.91 2006/01/08 02:33:16 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -705,11 +705,11 @@ static const paper_adjustment_t photo3_adjustments[] =
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
   { "Photo",        0.833, .5, 0.5, .25, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyPhoto",  0.833, .75, 0.5, .25, .999, 1, .7, .8, .66, 1, 0.92,
+  { "GlossyPhoto",  0.75, .5, 0.3, .25, 1.05, 1, .85, .85, .66, 1, 0.92,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Semigloss",    0.833, .75, 0.5, .3, .999, 1, .7, .8, .66, 1, 0.92,
+  { "Semigloss",    0.75, .5, 0.3, .25, .999, 1, .85, .85, .66, 1, 0.92,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Luster",       0.833, .75, 0.5, .3, .999, 1, .7, .8, .66, 1, 0.92,
+  { "Luster",       0.75, .5, 0.3, .25, .999, 1, .85, .85, .66, 1, 0.92,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
   { "GlossyPaper",  0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
@@ -957,53 +957,53 @@ 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,
+  { "Plain", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "PlainFast", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "PlainFast", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Postcard", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "Postcard", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "GlossyFilm", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Transparency", 0.83, .75, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "Transparency", 0.83, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Envelope", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "Envelope", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "BackFilm", 0.83, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Matte", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "Matte", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "MatteHeavy", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "MatteHeavy", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Glossy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "Glossy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyHeavy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "GlossyHeavy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Inkjet", 0.72, .5, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "Inkjet", 0.72, .5, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Coated", 0.83, .5, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "Coated", 0.83, .5, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Photo", 1.0, .75, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "Photo", 1.0, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyPhoto", 0.82, 1, 1, .02, 1.4, .882, 1, .300, 1, 1, 0.92,
+  { "GlossyPhoto", 0.600, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Semigloss", 0.82, .8, 1, .02, 1.4, .882, 1, .300, 1, 1, 0.92,
+  { "Semigloss", 0.600, .8, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Luster", 0.82, .8, 1, .02, 1.4, .882, 1, .300, 1, 1, 0.92,
+  { "Luster", 0.600, .8, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "ArchivalGlossy", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "ArchivalGlossy", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "WaterColorRadiant", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "WaterColorRadiant", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, .4, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "ArchivalMatte", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyPaper", 0.83, 1.0, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "GlossyPaper", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Ilford", 0.83, 1.0, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "Ilford", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj  },
-  { "ColorLife", 0.83, 1.0, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "ColorLife", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Other", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
+  { "Other", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
 };
 
@@ -1011,52 +1011,62 @@ DECLARE_PAPER_ADJUSTMENTS(r800_photo);
 
 static const paper_adjustment_t r800_matte_adjustments[] =
 {
-  { "Plain", 0.72, .1, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "Plain", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "PlainFast", 0.72, .1, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "PlainFast", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Postcard", 0.72, .1, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "Postcard", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "GlossyFilm", 0.83, .5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "GlossyFilm", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Transparency", 0.83, .5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "Transparency", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Envelope", 0.72, .1, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "Envelope", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "BackFilm", 0.83, .5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "BackFilm", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Matte", 0.92, 0.4, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "Matte", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.4, .4, .01, .5, .882, 1, .300, .6, 1, 1.0,
+  { "MatteHeavy", 0.92, 0.4, .4, .01, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Inkjet", 0.72, .3, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "Inkjet", 0.72, .3, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Coated", 0.83, .4, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "Coated", 0.83, .4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Photo", 1.0, 0.5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "Photo", 1.0, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "GlossyPhoto", 0.72, 1, .5, .025, .5, .882, 1, .300, .6, 1, 0.92,
+  { "GlossyPhoto", 0.546, 1, .5, .025, .5, .882, 1, .250, .6, 1, 0.92,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, .5, .025, .5, .882, 1, .300, .6, 1, 0.92,
+  { "Semigloss", 0.546, .8, .5, .025, .5, .882, 1, .250, .6, 1, 0.92,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Luster", 0.72, .8, .5, .025, .5, .882, 1, .300, .6, 1, 0.92,
+  { "Luster", 0.546, .8, .5, .025, .5, .882, 1, .250, .6, 1, 0.92,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, 0.4, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "ArchivalMatte", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "WaterColorRadiant", 0.92, 0.4, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "WaterColorRadiant", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "GlossyPaper", 0.83, 0.5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "GlossyPaper", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Ilford", 0.83, 0.5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "Ilford", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj  },
-  { "ColorLife", 0.83, 0.5, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "ColorLife", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Other", 0.72, .1, .5, .025, .5, .882, 1, .300, .6, 1, 1.0,
+  { "Other", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0,
     r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
 };
 
 DECLARE_PAPER_ADJUSTMENTS(r800_matte);
 
+static const paper_adjustment_t picturemate_adjustments[] =
+{
+  { "GlossyPhoto", 1.00, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
+    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
+  { "Other", 0.878, .1, 1, .02, 2.0, .882, 1, .250, 1, 1, 1.0,
+    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
+};
+
+DECLARE_PAPER_ADJUSTMENTS(picturemate);
+
 static const paper_adjustment_t durabrite_adjustments[] =
 {
   { "Plain", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
@@ -1420,3 +1430,13 @@ static const paper_t r800_papers[] =
 };
 
 DECLARE_PAPERS(r800);
+
+static const paper_t picturemate_papers[] =
+{
+  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
+    8, 0, 0x80, 0x00, 0x02, NULL, "picturematePhoto" },
+  { "Other", N_("Other"), PAPER_PLAIN,
+    0, 0, 0x6b, 0x1a, 0x01, NULL, "picturemateMatte" },
+};
+
+DECLARE_PAPERS(picturemate);
diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c
index 419cf48..a60dad1 100644
--- a/src/main/escp2-resolutions.c
+++ b/src/main/escp2-resolutions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-resolutions.c,v 1.29 2005/10/23 19:43:14 rlk Exp $"
+ * "$Id: escp2-resolutions.c,v 1.31 2006/01/07 02:43:28 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -96,6 +96,9 @@ static const res_t r_720hq =
 static const res_t r_720hq2 =
 { "720hq2",        N_("720 DPI Highest Quality"),
   720,  720,  720,  720,  1, 0, 4 };
+static const res_t r_720x720oov =
+{ "720x720oov",    N_("720 x 720 DPI"),
+  2880, 720,  720, 720,  1, 0, 1 };
 
 static const res_t r_1440x720mw =
 { "1440x720mw",     N_("1440 x 720 DPI"),
@@ -109,6 +112,12 @@ static const res_t r_1440x720hq2 =
 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_720x1440ov =
+{ "720x1440ov",   N_("1440 x 720 DPI Transposed"),
+  1440, 1440, 720, 1440, 1, 0, 1};
+static const res_t r_1440x720ov =
+{ "1440x720ov",    N_("1440 x 720 DPI"),
+  2880, 720,  1440, 720,  1, 0, 1 };
 
 static const res_t r_2880x720mw =
 { "2880x720mw",    N_("2880 x 720 DPI"),
@@ -140,6 +149,10 @@ 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_5760x1440sw =
+{ "5760x1440sw",   N_("5760 x 1440 DPI"),
+  5760, 1440,  5760, 1440, 1, 0, 1};
+
 static const res_t r_2880x2880mw =
 { "2880x2880mw",   N_("2880 x 2880 DPI"),
   2880, 2880,  2880, 2880, 0, 1, 1};
@@ -318,6 +331,24 @@ const res_t *const stpi_escp2_superfine_reslist[] =
   NULL
 };
 
+const res_t *const stpi_escp2_picturemate_reslist[] =
+{
+
+  &r_720x720oov,
+
+  &r_1440x720ov,
+
+  &r_720x1440ov,
+
+  &r_1440x1440sw,
+
+  &r_2880x1440sw,
+
+  &r_5760x1440sw,
+
+  NULL
+};
+
 const res_t *const stpi_escp2_sc500_reslist[] =
 {
   &r_360x90dpi,
diff --git a/src/main/gutenprint.pc.in b/src/main/gutenprint.pc.in
index 0f82a63..b7ad498 100644
--- a/src/main/gutenprint.pc.in
+++ b/src/main/gutenprint.pc.in
@@ -6,5 +6,6 @@ includedir=@includedir@
 Name: Gutenprint
 Description: Gutenprint Top Quality Printer Drivers
 Version: @gutenprint_version@
-Libs: -L${libdir} @gutenprint_libs@
+Libs: -L${libdir} @GUTENPRINT_LIBS@
+Libs.private: @gutenprint_libdeps@
 Cflags: -I${includedir} @gutenprint_cflags@
diff --git a/src/main/papers.xml b/src/main/papers.xml
index b45ce57..44db989 100644
--- a/src/main/papers.xml
+++ b/src/main/papers.xml
@@ -4,7 +4,7 @@
    XML description of papers known to libgutenprint.
    It should be edited by hand.
 
-   "$Id: papers.xml,v 1.18 2005/03/29 00:23:43 rlk Exp $"
+   "$Id: papers.xml,v 1.19 2005/12/31 17:22:32 rlk Exp $"
 -->
 
 <!--
@@ -78,7 +78,7 @@
       <description value="4x6"/>
       <width value="288"/>
       <height value="432"/>
-      <unit value="english-extended"/>
+      <unit value="english"/>
     </paper>
     <paper name="w324h495">
       <description value="Epson 4x6 Photo Paper"/>
diff --git a/src/main/print-color.c b/src/main/print-color.c
index c7c6574..43eedc4 100644
--- a/src/main/print-color.c
+++ b/src/main/print-color.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-color.c,v 1.132 2005/09/17 21:54:33 rlk Exp $"
+ * "$Id: print-color.c,v 1.134 2005/12/30 20:31:35 rlk Exp $"
  *
  *   Gutenprint color management module - traditional Gutenprint algorithm.
  *
@@ -545,7 +545,7 @@ static curve_param_t curve_parameters[] =
       "GCRCurve", N_("Gray Component Reduction"), N_("Advanced Output Control"),
       N_("Gray component reduction curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, 0, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 0, 1, 0
     }, &gcr_curve_bounds, CMASK_K, 0, 1, -1
   },
   RAW_CURVE_CHANNEL(0),
@@ -1375,7 +1375,8 @@ stpi_color_traditional_init(stp_vars_t *v,
   lut->steps = steps;
   lut->channel_depth = channel_depth->bits;
 
-  if (image_type && strcmp(image_type, "None") != 0)
+  if ((!color_correction || strcmp(color_correction, "None") == 0) &&
+      image_type && strcmp(image_type, "None") != 0)
     {
       if (strcmp(image_type, "Text") == 0)
 	lut->color_correction = get_color_correction("Threshold");
@@ -1506,10 +1507,6 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
 		  !(color_description->channels & ~CMASK_K))
 		description->is_active = 0;
 	    }
-	  if (stp_check_string_parameter(v, "ImageType", STP_PARAMETER_ACTIVE) &&
-	      strcmp(stp_get_string_parameter(v, "ImageType"), "None") != 0 &&
-	      description->p_level > STP_PARAMETER_LEVEL_BASIC)
-	    description->is_active = 0;
 	  switch (param->param.p_type)
 	    {
 	    case STP_PARAMETER_TYPE_BOOLEAN:
@@ -1633,11 +1630,7 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
 		  !(color_description->channels & ~CMASK_K))
 		description->is_active = 0;
 	    }
-	  if (stp_check_string_parameter(v, "ImageType", STP_PARAMETER_ACTIVE) &&
-	      strcmp(stp_get_string_parameter(v, "ImageType"), "None") != 0 &&
-	      description->p_level > STP_PARAMETER_LEVEL_BASIC)
-	    description->is_active = 0;
-	  else if (param->hsl_only)
+	  if (param->hsl_only)
 	    {
 	      const color_correction_t *correction =
 		(get_color_correction
diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c
index ac20bc4..93b9994 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.181 2005/10/29 21:31:19 rlk Exp $"
+ * "$Id: print-escp2-data.c,v 1.190 2006/01/10 03:15:30 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -126,6 +126,9 @@ static const escp2_dot_size_t spro5000_dotsizes =
 static const escp2_dot_size_t spro_c4pl_pigment_dotsizes =
 { 0x11, 0x11, 0x11, 0x10, 0x10,   -1,    5,    5,    5 };
 
+static const escp2_dot_size_t picturemate_dotsizes =
+{   -1,   -1,   -1,   -1, 0x12, 0x12, 0x12, 0x12,   -1 };
+
 /*
  * Bits are for:
  *
@@ -198,7 +201,7 @@ static const escp2_base_resolutions_t stc900_base_res =
 {  360,  360,  360,  360,  180,  180,  360,  360,  360 };
 
 static const escp2_base_resolutions_t pro_base_res =
-{ 2880, 2880, 2880, 2880, 2880, 2880, 2880, 2880, 2880 };
+{ 2880, 2880, 2880, 2880, 2880, 2880, 2880, 2880, 5760 };
 
 /*
  * Densities are for:
@@ -288,6 +291,9 @@ static const escp2_densities_t spro_pigment_densities =
 static const escp2_densities_t spro10000_densities =
 { 2.6, 1.3,  0.65, 0.431, 0.216, 0.392, 0.0,   0.0,   0.0   };
 
+static const escp2_densities_t picturemate_densities =
+{   0,   0,     0,     0, 1.596, 0.798, 0.650, 0.530, 0.0   };
+
 
 static const input_slot_t standard_roll_feed_input_slots[] =
 {
@@ -547,25 +553,57 @@ static const stp_raw_t je_deinit_sequence =
 
 #define INCH(x)		(72 * x)
 
+#define DECLARE_QUALITY_LIST(name)			\
+static const quality_list_t name##_quality_list =	\
+{							\
+  #name,						\
+  name##_qualities,					\
+  sizeof(name##_qualities) / sizeof(const quality_t),	\
+}
+
 static const quality_t standard_qualities[] =
 {
-  { "FastEconomy", N_("Fast Economy"), 360, 120, 0, 0, 360, 90 },
-  { "Economy",     N_("Economy"),      360, 240, 0, 0, 360, 180 },
-  { "Draft",       N_("Draft"),        360, 360, 0, 0, 360, 360 },
+  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
+  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
+  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
+  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
+  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
+  { "Photo",       N_("Photo"),        1440, 720, 2880, 720, 1440, 720 },
+  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
+  { "UltraPhoto",  N_("Ultra Photo"),  2880, 2880, 2880, 2880, 2880, 2880 },
+  { "Best",        N_("Best"),         720, 360, 0, 0, -1, -1 },
+};
+
+DECLARE_QUALITY_LIST(standard);
+
+static const quality_t p1_5_qualities[] =
+{
+  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
+  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
+  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
   { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
   { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
-  { "Photo",       N_("Photo"),        0, 0, 1440, 720, 1440, 720 },
-  { "HighPhoto",   N_("Super Photo"),  0, 0, 2880, 2880, 2880, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  0, 0, 2880, 2880, 2880, 2880 },
+  { "Photo",       N_("Photo"),        1440, 1440, 1440, 1440, 1440, 1440 },
+  { "HighPhoto",   N_("Super Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
+  { "UltraPhoto",  N_("Ultra Photo"),  2880, 2880, 2880, 2880, 2880, 2880 },
   { "Best",        N_("Best"),         720, 360, 0, 0, -1, -1 },
 };
 
-static const quality_list_t standard_quality_list =
+DECLARE_QUALITY_LIST(p1_5);
+
+static const quality_t picturemate_qualities[] =
 {
-  standard_qualities,
-  sizeof(standard_qualities) / sizeof(quality_t)
+  { "Draft",       N_("Draft"),        1440,  720, 1440,  720, 1440,  720 },
+  { "Standard",    N_("Standard"),     1440, 1440, 1440, 1440, 1440, 1440 },
+  { "Photo",       N_("Photo"),        1440, 1440, 1440, 1440, 1440, 1440 },
+  { "High",        N_("High"),         2880, 1440, 2880, 1440, 2880, 1440 },
+  { "HighPhoto",   N_("Super Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
+  { "UltraPhoto",  N_("Ultra Photo"),  5760, 1440, 5760, 1440, 5760, 1440 },
+  { "Best",        N_("Best"),         5760, 1440, 5760, 1440, 5760, 1440 },
 };
 
+DECLARE_QUALITY_LIST(picturemate);
+
 #define DECLARE_CHANNEL_LIST(name)			\
 static const channel_name_t name##_channel_name_list =	\
 {							\
@@ -584,6 +622,26 @@ static const char *standard_channel_names[] =
 
 DECLARE_CHANNEL_LIST(standard);
 
+static const char *cx3800_channel_names[] =
+{
+  N_("Cyan"),
+  N_("Yellow"),
+  N_("Magenta"),
+  N_("Black")
+};
+
+DECLARE_CHANNEL_LIST(cx3800);
+
+static const char *mfp2005_channel_names[] =
+{
+  N_("Cyan"),
+  N_("Magenta"),
+  N_("Yellow"),
+  N_("Black")
+};
+
+DECLARE_CHANNEL_LIST(mfp2005);
+
 static const char *photo_channel_names[] =
 {
   N_("Black"),
@@ -596,6 +654,18 @@ static const char *photo_channel_names[] =
 
 DECLARE_CHANNEL_LIST(photo);
 
+static const char *rx700_channel_names[] =
+{
+  N_("Black"),
+  N_("Cyan"),
+  N_("Light Cyan"),
+  N_("Magenta"),
+  N_("Light Magenta"),
+  N_("Yellow"),
+};
+
+DECLARE_CHANNEL_LIST(rx700);
+
 static const char *sp2200_channel_names[] =
 {
   N_("Black"),
@@ -649,6 +719,18 @@ static const char *r800_channel_names[] =
 
 DECLARE_CHANNEL_LIST(r800);
 
+static const char *picturemate_channel_names[] =
+{
+  N_("Yellow"),
+  N_("Magenta"),
+  N_("Cyan"),
+  N_("Black"),
+  N_("Red"),
+  N_("Blue"),
+};
+
+DECLARE_CHANNEL_LIST(picturemate);
+
 static const char *r2400_channel_names[] =
 {
   N_("Light Light Black"),
@@ -741,7 +823,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 4, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -758,7 +840,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 4, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -775,7 +857,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 4, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0,
     INCH(17), INCH(44), INCH(2), INCH(2),
     8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -898,7 +980,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 0,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1085,7 +1167,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 4, 0, 0, 0, 0,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0,
     INCH(17), INCH(44), INCH(2), INCH(2),
     8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1136,7 +1218,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 4,
+    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 4,
     INCH(13), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     1, 7, 0, 0,
@@ -1255,7 +1337,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 90, 90, 38, 1, 0, 0, 0, 0, 0,
+    360, 14400, -1, 2880, 720, 180, 180, 38, 1, 0, 0, 0, 0, 0,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0,
     3, 15, 0, 0,
@@ -1772,7 +1854,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
     stpi_escp2_superfine_reslist, &stpi_escp2_cmykrb_inkgroup,
     variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+    &p1_5_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &r800_channel_name_list
   },
   /* 65: Stylus Photo CX4600 */
@@ -1790,7 +1872,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     stpi_escp2_superfine_reslist, &stpi_escp2_cx3650_inkgroup,
     variable_bits, variable_base_res, &default_input_slot_list,
     &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    NULL, &mfp2005_channel_name_list
   },
   /* 66: Stylus Color C65/C66 */
   {
@@ -1823,7 +1905,7 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
     stpi_escp2_superfine_reslist, &stpi_escp2_cmykrb_inkgroup,
     variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+    &p1_5_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &r800_channel_name_list
   },
   /* 68: PM-G820 */
@@ -1867,15 +1949,15 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
      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,
+    360, 28800, -1, 5760, 2880, 360, 180, 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,
+    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842,
     4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
+    p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_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
+    variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
+    &p1_5_quality_list, &new_init_sequence, &je_deinit_sequence,
+    NULL, &rx700_channel_name_list
   },
   /* 71: Stylus Photo R2400 */
   {
@@ -1894,6 +1976,40 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &r2400_channel_name_list
   },
+  /* 72: Stylus CX3700/3800/3810 */
+  {
+    (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),
+    29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
+    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 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, -1, -1, 0, 0,
+    4, 15, 0, 0,
+    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops,
+    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c64_inkgroup,
+    variable_bits, variable_base_res, &default_input_slot_list,
+    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+    NULL, &cx3800_channel_name_list
+  },
+  /* 73: E-100/PictureMate */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
+     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
+    360, 28800, -1, 5760, 1440, 1440, 720, 0, 1, 0, 0, 0, 0, 0,
+    INCH(4), 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,
+    picturemate_dotsizes, picturemate_densities, &stpi_escp2_variable_picturemate_drops,
+    stpi_escp2_picturemate_reslist, &stpi_escp2_picturemate_inkgroup,
+    variable_bits, c1_5_base_res, &default_input_slot_list,
+    &picturemate_quality_list, &new_init_sequence, &je_deinit_sequence,
+    NULL, &picturemate_channel_name_list
+  },
 };
 
 const int stpi_escp2_model_limit =
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 4c4f588..0711874 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.345 2005/10/23 19:43:14 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.347 2006/01/09 12:20:44 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -527,14 +527,6 @@ static const float_param_t float_parameters[] =
       STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
-  {
-    {
-      "MultiChannelLimit", N_("Red and Blue Ink Usage"), N_("Advanced Ink Adjustment"),
-      N_("Amount of red and blue ink to use"),
-      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
-    }, 0.0, 1.0, 1.0, 1
-  },
 };
 
 static const int float_parameter_count =
@@ -809,42 +801,6 @@ escp2_paperlist(const stp_vars_t *v)
 }
 
 static int
-using_automatic_settings(const stp_vars_t *v, auto_mode_t mode)
-{
-  int is_raw = 0;
-  if (stp_get_string_parameter(v, "InputImageType") &&
-      strcmp(stp_get_string_parameter(v, "InputImageType"), "Raw") == 0)
-    is_raw = 1;
-  switch (mode)
-    {
-    case AUTO_MODE_QUALITY:
-      if (stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE) &&
-	  strcmp(stp_get_string_parameter(v, "Quality"), "None") != 0 &&
-	  !is_raw)
-	return 1;
-      else
-	return 0;
-#if 0
-    case AUTO_MODE_FULL_AUTO:
-      if (stp_check_string_parameter(v, "AutoMode", STP_PARAMETER_ACTIVE) &&
-	  strcmp(stp_get_string_parameter(v, "AutoMode"), "None") != 0 &&
-	  !is_raw)
-	return 1;
-      else
-	return 0;
-#endif
-    case AUTO_MODE_MANUAL:
-      if (!stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE) ||
-	  strcmp(stp_get_string_parameter(v, "Quality"), "None") == 0 ||
-	  is_raw)
-	return 1;
-      else
-	return 0;
-    }
-  return 0;
-}
-
-static int
 compute_internal_resid(int hres, int vres)
 {
   static const int resolutions[RES_N] =
@@ -963,6 +919,58 @@ get_media_type(const stp_vars_t *v)
   return NULL;
 }
 
+static void
+get_resolution_bounds_by_paper_type(const stp_vars_t *v,
+				    unsigned *max_x, unsigned *max_y,
+				    unsigned *min_x, unsigned *min_y)
+{
+  const paper_t *paper = get_media_type(v);
+  *min_x = 0;
+  *min_y = 0;
+  *max_x = 0;
+  *max_y = 0;
+  if (paper)
+    {
+      switch (paper->paper_class)
+	{
+	case PAPER_PLAIN:
+	  *min_x = 0;
+	  *min_y = 0;
+	  *max_x = 1440;
+	  *max_y = 720;
+	  break;
+	case PAPER_GOOD:
+	  *min_x = 360;
+	  *min_y = 360;
+	  *max_x = 1440;
+	  *max_y = 1440;
+	  break;
+	case PAPER_PHOTO:
+	  *min_x = 720;
+	  *min_y = 360;
+	  *max_x = 2880;
+	  *max_y = 1440;
+	  if (*min_x >= escp2_max_hres(v))
+	    *min_x = escp2_max_hres(v);
+	  break;
+	case PAPER_PREMIUM_PHOTO:
+	  *min_x = 720;
+	  *min_y = 720;
+	  *max_x = 0;
+	  *max_y = 0;
+	  if (*min_x >= escp2_max_hres(v))
+	    *min_x = escp2_max_hres(v);
+	  break;
+	case PAPER_TRANSPARENCY:
+	  *min_x = 360;
+	  *min_y = 360;
+	  *max_x = 720;
+	  *max_y = 720;
+	  break;
+	}
+    }
+}
+
 static int
 verify_resolution_by_paper_type(const stp_vars_t *v, const res_t *res)
 {
@@ -1129,8 +1137,7 @@ get_inktype(const stp_vars_t *v)
   int i;
 
   if (!ink_type || strcmp(ink_type, "None") == 0 ||
-      (ink_list && ink_list->n_inks == 1) ||
-      !using_automatic_settings(v, AUTO_MODE_MANUAL))
+      (ink_list && ink_list->n_inks == 1))
     ink_type = get_default_inktype(v);
 
   if (ink_type && ink_list)
@@ -1206,8 +1213,7 @@ set_density_parameter(const stp_vars_t *v,
 {
   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))
+      strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
       const escp2_inkname_t *ink_name = get_inktype(v);
       if (ink_name &&
@@ -1226,8 +1232,7 @@ set_hue_map_parameter(const stp_vars_t *v,
   description->deflt.curve = hue_curve_bounds;
   description->bounds.curve = stp_curve_create_copy(hue_curve_bounds);
   if (stp_get_string_parameter(v, "PrintingMode") &&
-      strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0 &&
-      using_automatic_settings(v, AUTO_MODE_MANUAL))
+      strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
       const escp2_inkname_t *ink_name = get_inktype(v);
       if (ink_name &&
@@ -1254,8 +1259,7 @@ set_color_transition_parameter(const stp_vars_t *v,
 {
   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))
+      strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
       const escp2_inkname_t *ink_name = get_inktype(v);
       if (ink_name &&
@@ -1275,20 +1279,19 @@ set_gray_transition_parameter(const stp_vars_t *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))
+       expected_channels))
     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,
+find_default_resolution(const stp_vars_t *v, const quality_t *q,
 			int strict)
 {
   const res_t *const *res = escp2_reslist(v);
   int i = 0;
-  if (desired_hres < 0)
+  if (q->desired_hres < 0)
     {
       while (res[i])
 	i++;
@@ -1301,15 +1304,60 @@ find_default_resolution(const stp_vars_t *v, int desired_hres, int desired_vres,
 	  i--;
 	}
     }
-  i = 0;
-  while (res[i])
-    {
-      if (verify_resolution(v, res[i]) &&
-	  verify_resolution_by_paper_type(v, res[i]) &&
-	  res[i]->vres >= desired_vres && res[i]->hres >= desired_hres &&
-	  res[i]->vres <= 2 * desired_vres && res[i]->hres <= 2 * desired_hres)
-	return res[i];
-      i++;
+  if (!strict)
+    {
+      unsigned max_x, max_y, min_x, min_y;
+      unsigned desired_hres = q->desired_hres;
+      unsigned desired_vres = q->desired_vres;
+      get_resolution_bounds_by_paper_type(v, &max_x, &max_y, &min_x, &min_y);
+      stp_dprintf(STP_DBG_ESCP2, v, "Comparing hres %d to %d, %d\n",
+		  desired_hres, min_x, max_x);
+      stp_dprintf(STP_DBG_ESCP2, v, "Comparing vres %d to %d, %d\n",
+		  desired_vres, min_y, max_y);
+      if (max_x > 0 && desired_hres > max_x)
+	{
+	  stp_dprintf(STP_DBG_ESCP2, v, "Decreasing hres from %d to %d\n",
+		      desired_hres, max_x);
+	  desired_hres = max_x;
+	}
+      else if (desired_hres < min_x)
+	{
+	  stp_dprintf(STP_DBG_ESCP2, v, "Increasing hres from %d to %d\n",
+		      desired_hres, min_x);
+	  desired_hres = min_x;
+	}
+      if (max_y > 0 && desired_vres > max_y)
+	{
+	  stp_dprintf(STP_DBG_ESCP2, v, "Decreasing vres from %d to %d\n",
+		      desired_vres, max_y);
+	  desired_vres = max_y;
+	}
+      else if (desired_vres < min_y)
+	{
+	  stp_dprintf(STP_DBG_ESCP2, v, "Increasing vres from %d to %d\n",
+		      desired_vres, min_y);
+	  desired_vres = min_y;
+	}
+      i = 0;
+      while (res[i])
+	{
+	  if (verify_resolution(v, res[i]) &&
+	      res[i]->printed_vres == desired_vres &&
+	      res[i]->printed_hres == desired_hres)
+	    return res[i];
+	  i++;
+	}
+      i = 0;
+      while (res[i])
+	{
+	  if (verify_resolution(v, res[i]) &&
+	      (q->min_vres == 0 || res[i]->printed_vres >= q->min_vres) &&
+	      (q->max_vres == 0 || res[i]->printed_vres <= q->max_vres) &&
+	      (q->min_hres == 0 || res[i]->printed_hres >= q->min_hres) &&
+	      (q->max_hres == 0 || res[i]->printed_hres <= q->max_hres))
+	    return res[i];
+	  i++;
+	}
     }
 #if 0
   if (!strict)			/* Try again to find a match */
@@ -1330,24 +1378,32 @@ find_default_resolution(const stp_vars_t *v, int desired_hres, int desired_vres,
   return NULL;
 }
 
+static int
+verify_quality(const stp_vars_t *v, const quality_t *q)
+{
+  if ((q->max_vres == 0 || escp2_min_vres(v) <= q->max_vres) &&
+      (q->max_hres == 0 || escp2_min_hres(v) <= q->max_hres) &&
+      (q->min_vres == 0 || escp2_max_vres(v) >= q->min_vres) &&
+      (q->min_hres == 0 || escp2_max_hres(v) >= q->min_hres))
+    return 1;
+  else
+    return 0;
+}
+
 static const res_t *
 find_resolution_from_quality(const stp_vars_t *v, const char *quality,
 			     int strict)
 {
   int i;
   const quality_list_t *quals = escp2_quality_list(v);
+  /* This is a rather gross hack... */
+  if (strcmp(quality, "None") == 0)
+    quality = "Standard";
   for (i = 0; i < quals->n_quals; i++)
     {
       const quality_t *q = &(quals->qualities[i]);
-      if (strcmp(quality, q->name) == 0 &&
-	  (q->min_vres == 0 || escp2_min_vres(v) <= q->min_vres) &&
-	  (q->min_hres == 0 || escp2_min_hres(v) <= q->min_hres) &&
-	  (q->max_vres == 0 || escp2_max_vres(v) >= q->max_vres) &&
-	  (q->max_hres == 0 || escp2_max_hres(v) >= q->max_hres))
-	{
-	  return find_default_resolution(v, q->desired_hres, q->desired_vres,
-					 strict);
-	}
+      if (strcmp(quality, q->name) == 0 && verify_quality(v, q))
+	return find_default_resolution(v, q, strict);
     }
   return NULL;
 }
@@ -1452,13 +1508,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       for (i = 0; i < quals->n_quals; i++)
 	{
 	  const quality_t *q = &(quals->qualities[i]);
-	  if (((q->min_vres == 0 || escp2_min_vres(v) <= q->min_vres) &&
-	       (q->min_hres == 0 || escp2_min_hres(v) <= q->min_hres) &&
-	       (q->max_vres == 0 || escp2_max_vres(v) >= q->max_vres) &&
-	       (q->max_hres == 0 || escp2_max_hres(v) >= q->max_hres)) &&
-	      (find_resolution_from_quality(v, q->name, 1) ||
-	       (!stp_check_string_parameter(v, "MediaType",
-					    STP_PARAMETER_ACTIVE))))
+	  if (verify_quality(v, q))
 	    stp_string_list_add_string(description->bounds.str, q->name,
 				       _(q->text));
 	  if (strcmp(q->name, "Standard") == 0)
@@ -1472,26 +1522,18 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "Resolution") == 0)
     {
       const res_t *const *res = escp2_reslist(v);
-      const res_t *defval = find_default_resolution(v, 720, 360, 0);
       description->bounds.str = stp_string_list_create();
+      stp_string_list_add_string(description->bounds.str, "None",
+				 _("Default"));
+      description->deflt.str = "None";
       i = 0;
       while (res[i])
 	{
-	  if (verify_resolution(v, res[i]) &&
-	      (using_automatic_settings(v, AUTO_MODE_MANUAL) ||
-	       !stp_check_string_parameter(v, "MediaType",
-					   STP_PARAMETER_ACTIVE) ||
-	       verify_resolution_by_paper_type(v, res[i])))
+	  if (verify_resolution(v, res[i]))
 	    stp_string_list_add_string(description->bounds.str,
 				       res[i]->name, _(res[i]->text));
 	  i++;
 	}
-      if (defval)
-	description->deflt.str = defval->name;
-      else
-	description->deflt.str = res[0]->name;
-      if (!using_automatic_settings(v, AUTO_MODE_MANUAL))
-	description->is_active = 0;
     }
   else if (strcmp(name, "InkType") == 0)
     {
@@ -1509,7 +1551,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 					 _(inks->inknames[i]->text));
 	  description->deflt.str = "None";
 	}
-      if (ninktypes <= 1 || !using_automatic_settings(v, AUTO_MODE_MANUAL))
+      else
 	description->is_active = 0;
     }
   else if (strcmp(name, "InkSet") == 0)
@@ -1530,9 +1572,6 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	    }
 	  description->deflt.str =
 	    stp_string_list_param(description->bounds.str, 0)->name;
-	  if (!using_automatic_settings(v, AUTO_MODE_MANUAL) &&
-	      has_default_choice)
-	    description->is_active = 0;
 	}
       else
 	description->is_active = 0;
@@ -1582,8 +1621,6 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	(description->bounds.str, "Unidirectional", _("Unidirectional"));
       description->deflt.str =
 	stp_string_list_param(description->bounds.str, 0)->name;
-      if (!using_automatic_settings(v, AUTO_MODE_MANUAL))
-	description->is_active = 0;
     }
   else if (strcmp(name, "Weave") == 0)
     {
@@ -1625,8 +1662,6 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       if (description->is_active)
 	description->deflt.str =
 	  stp_string_list_param(description->bounds.str, 0)->name;
-      if (!using_automatic_settings(v, AUTO_MODE_MANUAL))
-	description->is_active = 0;
     }
   else if (strcmp(name, "OutputOrder") == 0)
     {
@@ -1646,8 +1681,6 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "AdjustDotsize") == 0)
     {
       description->deflt.boolean = 0;
-      if (!using_automatic_settings(v, AUTO_MODE_MANUAL))
-	description->is_active = 0;
     }
   else if (strcmp(name, "CyanDensity") == 0)
     set_density_parameter(v, description, STP_ECOLOR_C);
@@ -1782,8 +1815,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     {
       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))
+	  strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
 	{
 	  const escp2_inkname_t *ink_name = get_inktype(v);
 	  if (ink_name && ink_name->inkset == INKSET_CMYKRB)
@@ -1795,7 +1827,20 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 static const res_t *
 escp2_find_resolution(const stp_vars_t *v)
 {
-  const char *resolution;
+  const char *resolution = stp_get_string_parameter(v, "Resolution");
+  if (resolution)
+    {
+      const res_t *const *res = escp2_reslist(v);
+      int i = 0;
+      while (res[i])
+	{
+	  if (!strcmp(resolution, res[i]->name))
+	    return res[i];
+	  else if (!strcmp(res[i]->name, ""))
+	    return NULL;
+	  i++;
+	}
+    }
   if (stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE))
     {
       const res_t *default_res =
@@ -1813,20 +1858,6 @@ escp2_find_resolution(const stp_vars_t *v)
 	stp_dprintf(STP_DBG_ESCP2, v, "Unable to map quality %s\n",
 		    stp_get_string_parameter(v, "Quality"));
     }
-  resolution = stp_get_string_parameter(v, "Resolution");
-  if (resolution)
-    {
-      const res_t *const *res = escp2_reslist(v);
-      int i = 0;
-      while (res[i])
-	{
-	  if (!strcmp(resolution, res[i]->name))
-	    return res[i];
-	  else if (!strcmp(res[i]->name, ""))
-	    return NULL;
-	  i++;
-	}
-    }
   return NULL;
 }
 
@@ -2232,16 +2263,11 @@ setup_inks(stp_vars_t *v)
   const escp2_dropsize_t *drops;
   const escp2_inkname_t *ink_type = pd->inkname;
   const paper_adjustment_t *paper = pd->paper_adjustment;
-  double multi_channel_limit = 1.0;
   int gloss_channel = -1;
   double gloss_scale = get_double_param(v, "Density");
 
   drops = escp2_dropsizes(v, pd->ink_resid);
   stp_init_debug_messages(v);
-  if (stp_check_float_parameter(v, "MultiChannelLimit",
-				STP_PARAMETER_DEFAULTED))
-    multi_channel_limit =
-      stp_get_float_parameter(v, "MultiChannelLimit");
   for (i = 0; i < pd->logical_channels; i++)
     {
       const ink_channel_t *channel = ink_type->channel_set->channels[i];
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index 8e4d373..e49f7e6 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.h,v 1.97 2005/10/23 19:43:14 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.100 2006/01/10 03:15:30 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -335,6 +335,7 @@ typedef struct
 
 typedef struct
 {
+  const char *name;
   const quality_t *qualities;
   size_t n_quals;
 } quality_list_t;
@@ -526,6 +527,7 @@ 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_picturemate_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;
@@ -539,6 +541,7 @@ 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 paperlist_t stpi_escp2_picturemate_paper_list;
 
 extern const paper_adjustment_list_t stpi_escp2_standard_paper_adjustment_list;
 extern const paper_adjustment_list_t stpi_escp2_durabrite_paper_adjustment_list;
@@ -553,6 +556,7 @@ extern const paper_adjustment_list_t stpi_escp2_ultrachrome_k3_photo_paper_adjus
 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;
+extern const paper_adjustment_list_t stpi_escp2_picturemate_paper_adjustment_list;
 
 extern const res_t *const stpi_escp2_superfine_reslist[];
 extern const res_t *const stpi_escp2_no_printer_weave_reslist[];
@@ -567,6 +571,7 @@ extern const res_t *const stpi_escp2_2880_1440dpi_reslist[];
 extern const res_t *const stpi_escp2_g3_reslist[];
 extern const res_t *const stpi_escp2_sc500_reslist[];
 extern const res_t *const stpi_escp2_sc640_reslist[];
+extern const res_t *const stpi_escp2_picturemate_reslist[];
 
 extern const inkgroup_t stpi_escp2_cmy_inkgroup;
 extern const inkgroup_t stpi_escp2_standard_inkgroup;
@@ -587,6 +592,7 @@ 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 inkgroup_t stpi_escp2_picturemate_inkgroup;
 
 extern const escp2_inkname_t stpi_escp2_default_black_inkset;
 
@@ -710,5 +716,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
 
 #endif /* GUTENPRINT_INTERNAL_ESCP2_H */
 /*
- * End of "$Id: print-escp2.h,v 1.97 2005/10/23 19:43:14 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.100 2006/01/10 03:15:30 rlk Exp $".
  */
diff --git a/src/main/printers.xml b/src/main/printers.xml
index d6e9ed3..bd4c41f 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.135 2005/11/21 12:25:38 rlk Exp $"
+   "$Id: printers.xml,v 1.140 2006/01/10 03:15:30 rlk Exp $"
 -->
 
 <gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
@@ -706,29 +706,49 @@
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
       <printer name="EPSON Stylus CX3500" driver="escp2-cx3500" manufacturer="Epson" model="65">
-        <parameter type="float" name="Gamma">0.470</parameter>
+        <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 CX3600" driver="escp2-cx3600" manufacturer="Epson" model="65">
-        <parameter type="float" name="Gamma">0.470</parameter>
+        <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 CX3650" driver="escp2-cx3650" 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 CX3700" driver="escp2-cx3700" manufacturer="Epson" model="72">
         <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">
+      <printer name="EPSON Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="72">
         <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">
+      <printer name="EPSON Stylus CX3805" driver="escp2-cx3805" manufacturer="Epson" model="72">
         <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">
+      <printer name="EPSON Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="72">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus CX4100" driver="escp2-cx4100" 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 CX4200" driver="escp2-cx4200" manufacturer="Epson" model="65">
         <parameter type="float" name="CyanGamma">0.96</parameter>
         <parameter type="float" name="MagentaGamma">1.02</parameter>
@@ -736,6 +756,13 @@
         <parameter type="float" name="Gamma">0.500</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus CX4500" driver="escp2-cx4500" 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>
@@ -785,6 +812,13 @@
         <parameter type="float" name="Gamma">0.500</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus CX5700" driver="escp2-cx5700" 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 CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65">
         <parameter type="float" name="CyanGamma">0.96</parameter>
         <parameter type="float" name="MagentaGamma">1.02</parameter>
@@ -856,11 +890,11 @@
         <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">
+      <printer name="EPSON Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72">
         <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">
+      <printer name="EPSON Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
@@ -871,10 +905,25 @@
         <parameter type="float" name="Gamma">0.500</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus DX4250" driver="escp2-dx4250" 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 PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON PictureMate Deluxe" driver="escp2-picmated" manufacturer="Epson" model="73">
+        <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>
@@ -893,6 +942,10 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON E-100" driver="escp2-e100" manufacturer="Epson" model="73">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON EM-900C" driver="escp2-em900c" manufacturer="Epson" model="13">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
@@ -1052,6 +1105,10 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON PM-A900" driver="escp2-pma900" manufacturer="Epson" model="70">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON PM-D750" driver="escp2-pmd750" manufacturer="Epson" model="63">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
@@ -1080,6 +1137,13 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON PX-A650" driver="escp2-pxa650" 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 PX-G900" driver="escp2-pxg900" manufacturer="Epson" model="64">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
@@ -1100,6 +1164,10 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON PX-5500" driver="escp2-px5500" manufacturer="Epson" model="71">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON PX-7000" driver="escp2-px7000" manufacturer="Epson" model="48">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
diff --git a/src/main/util.h b/src/main/util.h
index 5b3e01b..701a8eb 100644
--- a/src/main/util.h
+++ b/src/main/util.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.h,v 1.32 2004/09/17 18:38:27 rleigh Exp $"
+ * "$Id: util.h,v 1.33 2006/01/13 16:09:14 rleigh Exp $"
  *
  *   Gutenprint header.
  *
@@ -42,12 +42,6 @@
 extern "C" {
 #endif
 
-#ifndef __GNUC__
-#ifndef __attribute__
-#define __attribute__(ignore)
-#endif
-#endif
-
 /**
  * Utility functions (internal).
  *
@@ -73,5 +67,5 @@ extern void stpi_init_printer(void);
 
 #endif /* GUTENPRINT_INTERNAL_UTIL_H */
 /*
- * End of "$Id: util.h,v 1.32 2004/09/17 18:38:27 rleigh Exp $".
+ * End of "$Id: util.h,v 1.33 2006/01/13 16:09:14 rleigh Exp $".
  */
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index c34aede..0a5dbd8 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -311,10 +311,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/testpattern/run-testpattern b/src/testpattern/run-testpattern
index eea5754..360c81a 100755
--- a/src/testpattern/run-testpattern
+++ b/src/testpattern/run-testpattern
@@ -126,6 +126,7 @@ run_testpattern() {
     if [ $? -ne 0 ] ; then
 	retval=1
     fi
+    exit $retval
 }
 
 set_args `getopt hgvp:nc "$@"`
@@ -161,7 +162,7 @@ print_all_testpatterns() {
 }
 
 if [ -z "$dontrun" ] ; then
-    print_all_testpatterns | run_testpattern
+    print_all_testpatterns | run_testpattern 2>&1
 else
     print_all_testpatterns
 fi
diff --git a/src/testpattern/run-testpattern-1 b/src/testpattern/run-testpattern-1
index ee3af8c..466a476 100755
--- a/src/testpattern/run-testpattern-1
+++ b/src/testpattern/run-testpattern-1
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-retval=0;
+retval=0
 
 if [ -z "$STP_DATA_PATH" ] ; then
     STP_DATA_PATH=`pwd`/../main
@@ -218,6 +218,7 @@ run_testpattern() {
     if [ $? -ne 0 ] ; then
 	retval=1
     fi
+    exit $retval
 }
 
 set_args `getopt hgvp:nco "$@"`
@@ -278,9 +279,9 @@ print_all_testpatterns() {
 }
 
 if [ -z "$dontrun" ] ; then
-    (print_all_testpatterns | run_testpattern)
+    print_all_testpatterns | run_testpattern 2>&1
 else
-    (print_all_testpatterns)
+    print_all_testpatterns
 fi
 
 exit $?
diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c
index 2ebb6df..1585303 100644
--- a/src/testpattern/testpattern.c
+++ b/src/testpattern/testpattern.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpattern.c,v 1.42 2004/06/08 02:51:42 rlk Exp $"
+ * "$Id: testpattern.c,v 1.43 2006/01/15 22:00:57 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -269,8 +269,11 @@ do_print(void)
   stp_set_string_parameter(v, "InputImageType", global_image_type);
   sprintf(tmp, "%d", global_bit_depth);
   stp_set_string_parameter(v, "ChannelBitDepth", tmp);
-  sprintf(tmp, "%d", global_channel_depth);
-  stp_set_string_parameter(v, "RawChannels", tmp);
+  if (strcmp(global_image_type, "Raw") == 0)
+    {
+      sprintf(tmp, "%d", global_channel_depth);
+      stp_set_string_parameter(v, "RawChannels", tmp);
+    }
   stp_set_float_parameter(v, "Density", global_density);
   stp_set_string_parameter(v, "Quality", "None");
   stp_set_string_parameter(v, "ImageType", "None");
@@ -330,6 +333,7 @@ main(int argc, char **argv)
 {
   int c;
   int status;
+  int global_status = 0;
   while (1)
     {
       c = getopt(argc, argv, "n");
@@ -348,10 +352,12 @@ main(int argc, char **argv)
   while (1)
     {
       status = do_print();
-      if (status != 0)
+      if (status == 1)
 	break;
+      else if (status != 0)
+	global_status = 1;
     }
-  return status - 1;
+  return global_status;
 }
 
 static void
diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
index cb68f00..ad2e0c6 100644
--- a/src/testpattern/testpatternl.c
+++ b/src/testpattern/testpatternl.c
@@ -1,85 +1,32 @@
-
-#line 3 "testpatternl.c"
-
-#define  YY_INT_ALIGNED short int
-
 /* 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 $
+ */
+
 #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. */
-
-/* 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)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
 #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
 
@@ -87,17 +34,34 @@ typedef unsigned int flex_uint32_t;
 
 #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
 
@@ -112,71 +76,71 @@ typedef unsigned int flex_uint32_t;
  * 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
 
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
+/* 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 yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
+		*yy_cp = yy_hold_char; \
 		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		yy_c_buf_p = yy_cp = yy_bp + n - 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).
  */
-
-#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;
@@ -213,16 +177,12 @@ 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
@@ -236,33 +196,23 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-
 	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-/* 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. */
+static YY_BUFFER_STATE yy_current_buffer = 0;
 
 /* 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_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
+#define YY_CURRENT_BUFFER yy_current_buffer
 
-/* 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. */
@@ -275,93 +225,69 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-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 yyrestart YY_PROTO(( FILE *input_file ));
 
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+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 )
 
-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  );
+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 ));
 
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+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 * ));
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_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; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_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; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
 
-#define yywrap(n) 1
-#define YY_SKIP_YYWRAP
 
+#define yywrap() 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 (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[]  );
+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[] ));
 
 /* 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 = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
+	yytext_ptr = yy_bp; \
+	yyleng = (int) (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
-/* 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] =
+static yyconst short int yy_accept[233] =
     {   0,
         0,    0,   50,   49,   46,   48,   49,   47,   49,   49,
        43,   32,   45,   45,   45,   45,   45,   45,   45,   45,
@@ -391,7 +317,7 @@ static yyconst flex_int16_t yy_accept[233] =
        16,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -423,7 +349,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[38] =
+static yyconst int yy_meta[38] =
     {   0,
         1,    1,    2,    3,    1,    1,    1,    4,    4,    4,
         1,    4,    4,    4,    4,    4,    4,    4,    4,    4,
@@ -431,7 +357,7 @@ static yyconst flex_int32_t yy_meta[38] =
         4,    4,    4,    4,    4,    4,    4
     } ;
 
-static yyconst flex_int16_t yy_base[237] =
+static yyconst short int yy_base[237] =
     {   0,
         0,    0,  468,  469,  465,  469,    0,    0,  460,  455,
        29,  469,  455,   31,   32,   33,   34,   35,   40,   47,
@@ -461,7 +387,7 @@ static yyconst flex_int16_t yy_base[237] =
       343,  469,  412,  416,  420,  115
     } ;
 
-static yyconst flex_int16_t yy_def[237] =
+static yyconst short int yy_def[237] =
     {   0,
       232,    1,  232,  232,  232,  232,  233,  234,  235,  232,
       236,  232,  236,  236,  236,  236,  236,  236,  236,  236,
@@ -491,7 +417,7 @@ static yyconst flex_int16_t yy_def[237] =
       236,    0,  232,  232,  232,  232
     } ;
 
-static yyconst flex_int16_t yy_nxt[507] =
+static yyconst short int yy_nxt[507] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        12,   13,   13,   14,   15,   16,   17,   13,   18,   19,
@@ -551,7 +477,7 @@ static yyconst flex_int16_t yy_nxt[507] =
       232,  232,  232,  232,  232,  232
     } ;
 
-static yyconst flex_int16_t yy_chk[507] =
+static yyconst short int yy_chk[507] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -614,9 +540,6 @@ static yyconst flex_int16_t 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.
  */
@@ -626,6 +549,7 @@ int yy_flex_debug = 0;
 #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 $"
  *
@@ -687,21 +611,7 @@ do							\
  while (0)
 
 
-#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
+#line 615 "testpatternl.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -709,30 +619,65 @@ do							\
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap YY_PROTO(( void ));
 #else
-extern int yywrap (void );
+extern int yywrap YY_PROTO(( void ));
 #endif
 #endif
 
-    static void yyunput (int c,char *buf_ptr  );
-    
+#ifndef YY_NO_UNPUT
+static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+#endif
+
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+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
+
 #else
-static int input (void );
+#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. */
@@ -741,6 +686,7 @@ static int input (void );
 #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().
@@ -753,10 +699,9 @@ static int input (void );
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+	if ( yy_current_buffer->yy_is_interactive ) \
 		{ \
-		int c = '*'; \
-		size_t n; \
+		int c = '*', n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -766,22 +711,9 @@ static int input (void );
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	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); \
-			} \
-		}\
-\
-
+	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+		  && ferror( yyin ) ) \
+		YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -802,18 +734,12 @@ static int input (void );
 #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_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
+#define YY_DECL int yylex YY_PROTO(( void ))
+#endif
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -830,29 +756,27 @@ extern int yylex (void);
 #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 845 "testpatternl.c"
+#line 769 "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;
@@ -860,36 +784,34 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
+		if ( ! yy_current_buffer )
+			yy_current_buffer =
+				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 )
 				{
@@ -906,22 +828,24 @@ 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:
@@ -1145,7 +1069,6 @@ 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;
@@ -1161,7 +1084,6 @@ 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++;
@@ -1171,33 +1093,33 @@ YY_RULE_SETUP
 #line 125 "testpatternl.l"
 ECHO;
 	YY_BREAK
-#line 1175 "testpatternl.c"
+#line 1097 "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_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+		if ( yy_current_buffer->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_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			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;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1207,13 +1129,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_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p <= &yy_current_buffer->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
@@ -1226,30 +1148,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
@@ -1260,7 +1182,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;
@@ -1268,30 +1190,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_LVALUE->yy_ch_buf[(yy_n_chars)];
+				yy_c_buf_p =
+				&yy_current_buffer->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;
@@ -1302,7 +1224,8 @@ 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
  *
@@ -1311,20 +1234,21 @@ 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 (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
+
+static int yy_get_next_buffer()
+	{
+	register char *dest = yy_current_buffer->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_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+	if ( yy_current_buffer->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.
@@ -1344,30 +1268,34 @@ static int yy_get_next_buffer (void)
 	/* 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_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( yy_current_buffer->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_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
 
 	else
 		{
-			size_t num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+		int num_to_read =
+			yy_current_buffer->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 )
 				{
@@ -1380,7 +1308,8 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yy_flex_realloc( (void *) b->yy_ch_buf,
+							 b->yy_buf_size + 2 );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1390,35 +1319,35 @@ static int yy_get_next_buffer (void)
 				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_LVALUE->yy_buf_size -
+			num_to_read = yy_current_buffer->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_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
+			yy_n_chars, num_to_read );
 
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		yy_current_buffer->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_LVALUE->yy_buffer_status =
+			yy_current_buffer->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1426,31 +1355,32 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	(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;
+	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;
 
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+	yytext_ptr = &yy_current_buffer->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 (void)
-{
+static yy_state_type yy_get_previous_state()
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
 
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+	yy_current_state = yy_start;
+
+	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 )
 			{
@@ -1462,23 +1392,30 @@ static int yy_get_next_buffer (void)
 		}
 
 	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 );
  */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_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
+	{
 	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 )
 		{
@@ -1490,73 +1427,80 @@ static int yy_get_next_buffer (void)
 	yy_is_jam = (yy_current_state == 232);
 
 	return yy_is_jam ? 0 : yy_current_state;
-}
+	}
 
-    static void yyunput (int c, register char * yy_bp )
-{
-	register char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
+
+#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;
 
 	/* undo effects of setting up yytext */
-	*yy_cp = (yy_hold_char);
+	*yy_cp = yy_hold_char;
 
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+	if ( yy_cp < yy_current_buffer->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_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		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 char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+				&yy_current_buffer->yy_ch_buf[number_to_move];
 
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+		while ( source > yy_current_buffer->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+		yy_current_buffer->yy_n_chars =
+			yy_n_chars = yy_current_buffer->yy_buf_size;
 
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		if ( yy_cp < yy_current_buffer->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;
-}
 
-#ifndef YY_NO_INPUT
+	yytext_ptr = yy_bp;
+	yy_hold_char = *yy_cp;
+	yy_c_buf_p = yy_cp;
+	}
+#endif	/* ifndef YY_NO_UNPUT */
+
+
 #ifdef __cplusplus
-    static int yyinput (void)
+static int yyinput()
 #else
-    static int input  (void)
+static int input()
 #endif
-
-{
+	{
 	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+	*yy_c_buf_p = yy_hold_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_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p < &yy_current_buffer->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()
@@ -1570,16 +1514,16 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					yyrestart(yyin );
+					yyrestart( yyin );
 
-					/*FALLTHROUGH*/
+					/* fall through */
 
 				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();
@@ -1589,92 +1533,90 @@ static int yy_get_next_buffer (void)
 					}
 
 				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;
-}
-#endif	/* ifndef YY_NO_INPUT */
+	}
 
-/** 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 );
+
+#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 );
+
+	yy_init_buffer( yy_current_buffer, input_file );
+	yy_load_buffer_state();
 	}
 
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
 
-/** 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 )
+#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 )
 		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_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		*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_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
+	yy_current_buffer = 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;
-}
+	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);
-}
 
-/** 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 )
-{
+#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;
+	}
+
+
+#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
+	{
 	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1683,75 +1625,80 @@ static void yy_load_buffer_state  (void)
 	/* 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 *) yyalloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yy_flex_alloc( 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;
-}
+	}
 
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
+
+#ifdef YY_USE_PROTOS
+void yy_delete_buffer( YY_BUFFER_STATE b )
+#else
+void yy_delete_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+	{
 	if ( ! b )
 		return;
 
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+	if ( b == yy_current_buffer )
+		yy_current_buffer = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
+		yy_flex_free( (void *) b->yy_ch_buf );
 
-	yyfree((void *) b  );
-}
+	yy_flex_free( (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 )
 
-{
-	int oerrno = errno;
-    
-	yy_flush_buffer(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
+
+
+	{
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* 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;
-    }
+#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
+	}
 
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-	errno = oerrno;
-}
 
-/** 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 )
+#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 )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1768,121 +1715,29 @@ extern int isatty (int );
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	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;
+	if ( b == yy_current_buffer )
+		yy_load_buffer_state();
 	}
 
-	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 )
-{
+#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 ( 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) yyalloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -1896,43 +1751,47 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, 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
 
-/** 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) );
-}
 
-/** 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 )
-{
+#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
+
+
+#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
+	{
 	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 *) yyalloc(n  );
+	buf = (char *) yy_flex_alloc( n );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -1941,7 +1800,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, 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()" );
 
@@ -1951,164 +1810,148 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
 	b->yy_is_our_buffer = 1;
 
 	return b;
-}
+	}
+#endif
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
+
+#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;
 #endif
+	{
+	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+		{
+		yy_size_t new_size;
 
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
+		yy_start_stack_depth += YY_START_STACK_INCR;
+		new_size = yy_start_stack_depth * sizeof( int );
 
-/* Redefine yyless() so it works in section 3 code. */
+		if ( ! yy_start_stack )
+			yy_start_stack = (int *) yy_flex_alloc( 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 )
+		else
+			yy_start_stack = (int *) yy_flex_realloc(
+					(void *) yy_start_stack, new_size );
 
-/* Accessor  methods (get/set functions) to struct members. */
+		if ( ! yy_start_stack )
+			YY_FATAL_ERROR(
+			"out of memory expanding start-condition stack" );
+		}
 
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
+	yy_start_stack[yy_start_stack_ptr++] = YY_START;
 
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
+	BEGIN(new_state);
+	}
+#endif
 
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
 
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
+#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 current token.
- * 
- */
+	BEGIN(yy_start_stack[yy_start_stack_ptr]);
+	}
+#endif
 
-char *yyget_text  (void)
-{
-        return yytext;
-}
 
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state()
+	{
+	return yy_start_stack[yy_start_stack_ptr - 1];
+	}
+#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 ;
-}
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
 
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_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 );
+	}
 
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
 
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
 
-/* 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();
-	}
+/* Redefine yyless() so it works in section 3 code. */
 
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
+#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 )
 
-    return 0;
-}
 
-/*
- * Internal utility routines.
- */
+/* Internal utility routines. */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
+#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
+	{
 	register int i;
-    	for ( i = 0; i < n; ++i )
+	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-}
+	}
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
+#ifdef YY_USE_PROTOS
+static int yy_flex_strlen( yyconst char *s )
+#else
+static int yy_flex_strlen( s )
+yyconst char *s;
+#endif
+	{
 	register int n;
-    	for ( n = 0; s[n]; ++n )
+	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-}
+	}
 #endif
 
-void *yyalloc (yy_size_t  size )
-{
+
+#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
+	{
 	return (void *) malloc( size );
-}
+	}
 
-void *yyrealloc  (void * ptr, yy_size_t  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
+	{
 	/* 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
@@ -2117,25 +1960,23 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#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_USE_PROTOS
+static void yy_flex_free( void *ptr )
+#else
+static void yy_flex_free( ptr )
+void *ptr;
+#endif
+	{
+	free( ptr );
+	}
 
-#ifdef YY_DECL_IS_OURS
-#undef YY_DECL_IS_OURS
-#undef YY_DECL
+#if YY_MAIN
+int main()
+	{
+	yylex();
+	return 0;
+	}
 #endif
 #line 125 "testpatternl.l"
diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
index cd1c6d3..ede6285 100644
--- a/src/testpattern/testpatterny.c
+++ b/src/testpattern/testpatterny.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, 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,9 +36,6 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
-/* Bison version.  */
-#define YYBISON_VERSION "2.1"
-
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -102,7 +99,6 @@
      END = 301
    };
 #endif
-/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tSTRING 260
@@ -232,11 +228,6 @@ 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 */
@@ -249,48 +240,22 @@ typedef int YYSTYPE;
 /* Copy the second part of user declarations.  */
 
 
-/* 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
+/* Line 214 of yacc.c.  */
+#line 244 "testpatterny.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   else
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
+# else
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
 #    define YYSTACK_ALLOC alloca
-#    if defined (__STDC__) || defined (__cplusplus)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     define YYINCLUDED_STDLIB_H
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
 #    endif
 #   endif
 #  endif
@@ -299,51 +264,25 @@ 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
-#  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
-}
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
 #  endif
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+	 || (YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  short yyss;
   YYSTYPE yyvs;
   };
 
@@ -353,20 +292,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 int) + sizeof (YYSTYPE))			\
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  YYSIZE_T yyi;				\
+	  register YYSIZE_T yyi;		\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
@@ -395,7 +334,7 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short int yysigned_char;
+   typedef short yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
@@ -416,7 +355,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.  */
@@ -458,7 +397,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 int yyprhs[] =
+static const unsigned short yyprhs[] =
 {
        0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
       19,    22,    25,    28,    31,    34,    37,    41,    43,    45,
@@ -511,7 +450,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const unsigned short yyrline[] =
 {
        0,   139,   139,   139,   139,   139,   140,   140,   140,   140,
      143,   155,   167,   179,   191,   203,   215,   227,   227,   227,
@@ -528,38 +467,38 @@ static const unsigned short int yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[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 int yytoknum[] =
+static const unsigned short yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -628,7 +567,7 @@ static const unsigned char yydefact[] =
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
+static const short yydefgoto[] =
 {
       -1,   137,    85,    86,    87,    88,    89,    90,    91,    92,
       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
@@ -642,7 +581,7 @@ static const short int yydefgoto[] =
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 #define YYPACT_NINF -131
-static const short int yypact[] =
+static const short yypact[] =
 {
     -131,   -14,    16,    56,    41,    25,    36,    38,    53,    66,
       67,    69,    70,    77,    78,    79,    81,    39,    22,    80,
@@ -664,7 +603,7 @@ static const short int yypact[] =
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short int yypgoto[] =
+static const short yypgoto[] =
 {
     -131,    52,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
     -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
@@ -739,6 +678,22 @@ 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)
@@ -746,8 +701,7 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
+#define YYERROR		goto yyerrlab1
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -768,59 +722,26 @@ do								\
       goto yybackup;						\
     }								\
   else								\
-    {								\
-      yyerror (YY_("syntax error: cannot back up")); \
+    { 								\
+      yyerror ("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)				\
-    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
+# 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;
 #endif
 
-
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -843,30 +764,36 @@ do {						\
     YYFPRINTF Args;				\
 } while (0)
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
+# define YYDSYMPRINT(Args)			\
+do {						\
+  if (yydebug)					\
+    yysymprint Args;				\
+} while (0)
+
+# define YYDSYMPRINTF(Title, Token, Value, Location)		\
 do {								\
   if (yydebug)							\
     {								\
       YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr,					\
-                  Type, Value);	\
+      yysymprint (stderr, 					\
+                  Token, Value);	\
       YYFPRINTF (stderr, "\n");					\
     }								\
 } while (0)
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
+| TOP (cinluded).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (short *bottom, short *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+    short *bottom;
+    short *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -896,13 +823,13 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
-             yyrule - 1, yylno);
+  unsigned int yylineno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+             yyrule - 1, yylineno);
   /* 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)		\
@@ -916,7 +843,8 @@ do {					\
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -931,9 +859,13 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
+#if YYMAXDEPTH == 0
+# undef YYMAXDEPTH
+#endif
+
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -955,7 +887,7 @@ yystrlen (yystr)
      const char *yystr;
 #   endif
 {
-  const char *yys = yystr;
+  register const char *yys = yystr;
 
   while (*yys++ != '\0')
     continue;
@@ -980,8 +912,8 @@ yystpcpy (yydest, yysrc)
      const char *yysrc;
 #   endif
 {
-  char *yyd = yydest;
-  const char *yys = yysrc;
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -991,55 +923,7 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-# 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 */
+#endif /* !YYERROR_VERBOSE */
 
 
 
@@ -1063,15 +947,15 @@ yysymprint (yyoutput, yytype, yyvaluep)
   (void) yyvaluep;
 
   if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+    {
+      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+    }
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
   switch (yytype)
     {
       default:
@@ -1087,11 +971,10 @@ yysymprint (yyoutput, yytype, yyvaluep)
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
+yydestruct (yytype, yyvaluep)
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
@@ -1099,10 +982,6 @@ yydestruct (yymsg, yytype, yyvaluep)
   /* Pacify ``unused variable'' warnings.  */
   (void) yyvaluep;
 
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
   switch (yytype)
     {
 
@@ -1130,10 +1009,10 @@ int yyparse ();
 
 
 
-/* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1159,17 +1038,17 @@ yyparse (void)
 #else
 int
 yyparse ()
-    ;
+
 #endif
 #endif
 {
   
-  int yystate;
-  int yyn;
+  register int yystate;
+  register int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
+  /* Lookahead token as an internal (translated) token number.  */
   int yytoken = 0;
 
   /* Three stacks and their tools:
@@ -1181,14 +1060,14 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  short int *yyssp;
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+  register YYSTYPE *yyvsp;
 
 
 
@@ -1245,14 +1124,14 @@ yyparse ()
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
+	short *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 (YY_("memory exhausted"),
+	yyoverflow ("parser stack overflow",
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -1263,21 +1142,21 @@ yyparse ()
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
+      goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+	goto yyoverflowlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyexhaustedlab;
+	  goto yyoverflowlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -1309,18 +1188,18 @@ yyparse ()
 yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a look-ahead token if we need one and don't already have one.  */
+/* Read a lookahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1335,7 +1214,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1355,8 +1234,8 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the look-ahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  /* Shift the lookahead token.  */
+  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
@@ -1409,12 +1288,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;
 
@@ -1422,12 +1301,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;
 
@@ -1435,12 +1314,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;
 
@@ -1448,12 +1327,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;
 
@@ -1461,12 +1340,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;
 
@@ -1474,12 +1353,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;
 
@@ -1487,23 +1366,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;
 
@@ -1511,20 +1390,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;
 
@@ -1532,9 +1411,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;
 
@@ -1542,8 +1421,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;
 
@@ -1551,8 +1430,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;
 
@@ -1560,8 +1439,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;
 
@@ -1569,9 +1448,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;
 
@@ -1579,9 +1458,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;
 
@@ -1589,9 +1468,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;
 
@@ -1599,10 +1478,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;
 
@@ -1610,9 +1489,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;
 
@@ -1620,9 +1499,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;
 
@@ -1630,8 +1509,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;
 
@@ -1639,8 +1518,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;
 
@@ -1648,8 +1527,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;
 
@@ -1657,8 +1536,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;
 
@@ -1666,8 +1545,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;
 
@@ -1675,8 +1554,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;
 
@@ -1684,13 +1563,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++;
 	    }
 	}
@@ -1699,14 +1578,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;
@@ -1715,12 +1594,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;
@@ -1729,13 +1608,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;
 	}
@@ -1761,9 +1640,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;
 	}
@@ -1773,10 +1652,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)
 	    {
@@ -1790,50 +1669,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;
 
@@ -1865,11 +1744,10 @@ yyreduce:
     break;
 
 
-      default: break;
     }
 
-/* Line 1126 of yacc.c.  */
-#line 1873 "testpatterny.c"
+/* Line 991 of yacc.c.  */
+#line 1750 "testpatterny.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1908,153 +1786,104 @@ yyerrlab:
 
       if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
+	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
-	  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;
+	  char *yymsg;
+	  int yyx, yycount;
 
+	  yycount = 0;
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  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)
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		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)
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("syntax error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[yytype]);
+	  yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg != 0)
 	    {
-	      /* 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))
+	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[yytype]);
+
+	      if (yycount < 5)
 		{
-		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		    {
-		      yyp += yytnamerr (yyp, yyarg[yyi++]);
-		      yyf += 2;
-		    }
-		  else
-		    {
-		      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++;
+		      }
 		}
 	      yyerror (yymsg);
 	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    {
-	      yyerror (YY_("syntax error"));
-	      goto yyexhaustedlab;
-	    }
+	    yyerror ("syntax error; also virtual memory exhausted");
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror (YY_("syntax error"));
+	yyerror ("syntax error");
     }
 
 
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      if (yychar <= YYEOF)
+      /* Return failure if at end of input.  */
+      if (yychar == YYEOF)
         {
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
+	  /* 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;
         }
-      else
-	{
-	  yydestruct ("Error: discarding", yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+
+      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+      yydestruct (yytoken, &yylval);
+      yychar = YYEMPTY;
+
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
-  goto yyerrlab1;
+  goto yyerrlab2;
 
 
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
+/*----------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action.  |
+`----------------------------------------------------*/
+yyerrlab1:
 
-  /* 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;
+  /* 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
 
-yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
 
+  goto yyerrlab2;
 
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
+
+/*---------------------------------------------------------------.
+| yyerrlab2 -- pop states until the error token can be shifted.  |
+`---------------------------------------------------------------*/
+yyerrlab2:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -2075,21 +1904,21 @@ yyerrlab1:
       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;
 
-  *++yyvsp = yylval;
+  YYDPRINTF ((stderr, "Shifting error token, "));
 
+  *++yyvsp = yylval;
 
-  /* Shift the error token. */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -2110,25 +1939,16 @@ yyabortlab:
   goto yyreturn;
 
 #ifndef yyoverflow
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
   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 3b0a9f4..2567b82 100644
--- a/src/testpattern/testpatterny.h
+++ b/src/testpattern/testpatterny.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, 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,7 +75,6 @@
      END = 301
    };
 #endif
-/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tSTRING 260
diff --git a/test/Makefile.in b/test/Makefile.in
index 7648c96..31a2f89 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -314,10 +314,13 @@ exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
 gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
 gutenprint_libs = @gutenprint_libs@
 gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
 gutenprintui2_libs = @gutenprintui2_libs@
 gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libdeps = @gutenprintui_libdeps@
 gutenprintui_libs = @gutenprintui_libs@
 host = @host@
 host_alias = @host_alias@