Imported Upstream version 4.3.99+cvs20050702

19 files changed, 777 insertions, 2108 deletions

diff --git a/man/Makefile.am b/man/Makefile.am
index 73d933a..8b0c91c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.6.6.2 2002/11/11 21:20:10 rleigh Exp $
+## $Id: Makefile.am,v 1.21 2005/04/18 10:54:56 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -23,31 +23,42 @@ AUTOMAKE_OPTIONS = 1.4 gnu
 
 MAINT_CHARSET = latin1
 
+include $(top_srcdir)/scripts/global.mk
+
 
 ## Data
 
-# Conditional installation of manpages is currently broken in automake 1.4
+# Conditional installation of manpages is currently broken in automake...
+
+if BUILD_CUPS
+CUPS_MAN = \
+	cups-calibrate.8 \
+	cups-genppd.8 \
+	cups-genppdconfig.8 \
+	cups-genppdupdate.8
+endif
+
+if BUILD_ESCPUTIL
+ESCPUTIL_MAN = escputil.1
+endif
+
+if BUILD_GHOSTSCRIPT
+GHOSTSCRIPT_MAN = ijsgutenprint.1
+endif
+
+man_MANS = $(CUPS_MAN) $(ESCPUTIL_MAN) $(GHOSTSCRIPT_MAN)
 
-man_MANS = \
+EXTRA_man_MANS = \
 	cups-calibrate.8 \
+	cups-genppd.8 \
+	cups-genppdconfig.8 \
+	cups-genppdupdate.8 \
 	escputil.1 \
-	gimpprint.3 \
-	gimpprint-config.1 \
-	gimpprint-color.7 \
-	gimpprint-dithers.7 \
-	gimpprint-imagetypes.7 \
-	gimpprint-inktypes.7 \
-	gimpprint-mediasizes.7 \
-	gimpprint-mediasources.7 \
-	gimpprint-mediatypes.7 \
-	gimpprint-models.7 \
-	gimpprint-resolutions.7 \
-	ijsgimpprint.1
+	ijsgutenprint.1
 
 
 ## Clean
 
-DISTCLEANFILES = $(man_MANS)
+DISTCLEANFILES = $(MAIN_MAN) $(EXTRA_man_MANS)
 MAINTAINERCLEANFILES = Makefile.in
 
-# EXTRA_DIST = $(man_MANS)
diff --git a/man/Makefile.in b/man/Makefile.in
index 60e97ad..df0c964 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,362 +12,438 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
 
-SHELL = @SHELL@
-
+# Variables
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/cups-calibrate.8.in $(srcdir)/cups-genppd.8.in \
+	$(srcdir)/cups-genppdconfig.8.in \
+	$(srcdir)/cups-genppdupdate.8.in $(srcdir)/escputil.1.in \
+	$(srcdir)/ijsgutenprint.1.in $(top_srcdir)/scripts/global.mk
+subdir = man
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = cups-calibrate.8 cups-genppd.8 \
+	cups-genppdconfig.8 cups-genppdupdate.8 escputil.1 \
+	ijsgutenprint.1
+SOURCES =
+DIST_SOURCES =
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
+man8dir = $(mandir)/man8
+NROFF = nroff
+MANS = $(man_MANS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AS = @AS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BISON_PROG = @BISON_PROG@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
+BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
+BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
+BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
+BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
+BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
+BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
+BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
+BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
+BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
+BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
+BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
+BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
+BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
+BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
+BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
+BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
+BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
+BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
+BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
+BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
+BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
+BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
+BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
+BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
+BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
+BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
+BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
+BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
-CUPS_BACKEND_BIN = @CUPS_BACKEND_BIN@
-CUPS_BIN = @CUPS_BIN@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
 CUPS_CFLAGS = @CUPS_CFLAGS@
-CUPS_CONF = @CUPS_CONF@
 CUPS_CONFIG = @CUPS_CONFIG@
-CUPS_FILTER_BIN = @CUPS_FILTER_BIN@
-CUPS_INSTALL = @CUPS_INSTALL@
 CUPS_LIBS = @CUPS_LIBS@
-CUPS_MAN = @CUPS_MAN@
-CUPS_NOINST_BIN = @CUPS_NOINST_BIN@
-CUPS_PKG = @CUPS_PKG@
+CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
+CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-DATADIRNAME = @DATADIRNAME@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
-DLLTOOL = @DLLTOOL@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
-ESCPUTIL_BIN = @ESCPUTIL_BIN@
-ESCPUTIL_MAN = @ESCPUTIL_MAN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FOOMATIC_3_NOINST_BIN = @FOOMATIC_3_NOINST_BIN@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
-FOOMATIC_INSTALL = @FOOMATIC_INSTALL@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
-FOOMATIC_NOINST_BIN = @FOOMATIC_NOINST_BIN@
-FOOMATIC_OLDIDS_NOINST_BIN = @FOOMATIC_OLDIDS_NOINST_BIN@
 FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
-GENCAT = @GENCAT@
-GIMPPRINT_BINARY_AGE = @GIMPPRINT_BINARY_AGE@
-GIMPPRINT_CFLAGS = @GIMPPRINT_CFLAGS@
-GIMPPRINT_CURRENT_INTERFACE = @GIMPPRINT_CURRENT_INTERFACE@
-GIMPPRINT_DEPLIBS = @GIMPPRINT_DEPLIBS@
-GIMPPRINT_INTERFACE_AGE = @GIMPPRINT_INTERFACE_AGE@
-GIMPPRINT_LIBS = @GIMPPRINT_LIBS@
-GIMPPRINT_MAJOR_VERSION = @GIMPPRINT_MAJOR_VERSION@
-GIMPPRINT_MICRO_VERSION = @GIMPPRINT_MICRO_VERSION@
-GIMPPRINT_MINOR_VERSION = @GIMPPRINT_MINOR_VERSION@
-GIMPPRINT_VERSION = @GIMPPRINT_VERSION@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL = @GIMPTOOL@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GIMPTOOL_CHECK = @GIMPTOOL_CHECK@
-GIMP_BIN = @GIMP_BIN@
 GIMP_CFLAGS = @GIMP_CFLAGS@
 GIMP_CFLAGS_NOUI = @GIMP_CFLAGS_NOUI@
 GIMP_DATA_DIR = @GIMP_DATA_DIR@
 GIMP_LIBS = @GIMP_LIBS@
 GIMP_LIBS_NOUI = @GIMP_LIBS_NOUI@
 GIMP_PLUGIN_DIR = @GIMP_PLUGIN_DIR@
-GLIBC21 = @GLIBC21@
-GMOFILES = @GMOFILES@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_CONFIG = @GLIB_CONFIG@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
-IJS_BIN = @IJS_BIN@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CONFIG = @GTK_CONFIG@
+GTK_LIBS = @GTK_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINTUI_BINARY_AGE = @GUTENPRINTUI_BINARY_AGE@
+GUTENPRINTUI_CFLAGS = @GUTENPRINTUI_CFLAGS@
+GUTENPRINTUI_CURRENT_INTERFACE = @GUTENPRINTUI_CURRENT_INTERFACE@
+GUTENPRINTUI_INTERFACE_AGE = @GUTENPRINTUI_INTERFACE_AGE@
+GUTENPRINTUI_LIBDEPS = @GUTENPRINTUI_LIBDEPS@
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+GUTENPRINTUI_VERSION = @GUTENPRINTUI_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
 IJS_CFLAGS = @IJS_CFLAGS@
 IJS_CONFIG = @IJS_CONFIG@
-IJS_INSTALL = @IJS_INSTALL@
 IJS_LIBS = @IJS_LIBS@
-INCLUDES = @INCLUDES@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
+INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
+INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
 INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LDFLAGS = @LDFLAGS@
 LEX = @LEX@
-LIBGIMPPRINT_LIBS = @LIBGIMPPRINT_LIBS@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBICONV = @LIBICONV@
-LIBM = @LIBM@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
 LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAIN_BIN = @MAIN_BIN@
-MAIN_DAT = @MAIN_DAT@
-MAIN_MAN = @MAIN_MAN@
-MAIN_SCR = @MAIN_SCR@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-OBJDUMP = @OBJDUMP@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
 PLUG_IN_PATH = @PLUG_IN_PATH@
-POFILES = @POFILES@
 POSUB = @POSUB@
-PRINT_VASPRINTF = @PRINT_VASPRINTF@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
 RM = @RM@
-SAMPLE_IMAGES = @SAMPLE_IMAGES@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
-TESTPATTERN_BIN = @TESTPATTERN_BIN@
-TEST_BIN = @TEST_BIN@
 TEXI2HTML = @TEXI2HTML@
-USER_GUIDE = @USER_GUIDE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
+USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
 USE_NLS = @USE_NLS@
+USE_NLS_FALSE = @USE_NLS_FALSE@
+USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-YACC_PROG = @YACC_PROG@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 cups_bindir = @cups_bindir@
 cups_conf_datadir = @cups_conf_datadir@
 cups_conf_serverbin = @cups_conf_serverbin@
 cups_conf_serverroot = @cups_conf_serverroot@
 cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
-gimpprint_cflags = @gimpprint_cflags@
-gimpprint_libs = @gimpprint_libs@
-
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libs = @gutenprintui2_libs@
+gutenprintui_cflags = @gutenprintui_cflags@
+gutenprintui_libs = @gutenprintui_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = 1.4 gnu
-
 MAINT_CHARSET = latin1
-
-# Conditional installation of manpages is currently broken in automake 1.4
-
-man_MANS =  	cups-calibrate.8 	escputil.1 	gimpprint.3 	gimpprint-config.1 	gimpprint-color.7 	gimpprint-dithers.7 	gimpprint-imagetypes.7 	gimpprint-inktypes.7 	gimpprint-mediasizes.7 	gimpprint-mediasources.7 	gimpprint-mediatypes.7 	gimpprint-models.7 	gimpprint-resolutions.7 	ijsgimpprint.1
-
-
-DISTCLEANFILES = $(man_MANS)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+
+# Conditional installation of manpages is currently broken in automake...
+@BUILD_CUPS_TRUE@CUPS_MAN = \
+@BUILD_CUPS_TRUE@	cups-calibrate.8 \
+@BUILD_CUPS_TRUE@	cups-genppd.8 \
+@BUILD_CUPS_TRUE@	cups-genppdconfig.8 \
+@BUILD_CUPS_TRUE@	cups-genppdupdate.8
+
+@BUILD_ESCPUTIL_TRUE@ESCPUTIL_MAN = escputil.1
+@BUILD_GHOSTSCRIPT_TRUE@GHOSTSCRIPT_MAN = ijsgutenprint.1
+man_MANS = $(CUPS_MAN) $(ESCPUTIL_MAN) $(GHOSTSCRIPT_MAN)
+EXTRA_man_MANS = \
+	cups-calibrate.8 \
+	cups-genppd.8 \
+	cups-genppdconfig.8 \
+	cups-genppdupdate.8 \
+	escputil.1 \
+	ijsgutenprint.1
+
+DISTCLEANFILES = $(MAIN_MAN) $(EXTRA_man_MANS)
 MAINTAINERCLEANFILES = Makefile.in
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =  escputil.1 gimpprint.3 gimpprint-config.1 \
-gimpprint-color.7 gimpprint-dithers.7 gimpprint-imagetypes.7 \
-gimpprint-inktypes.7 gimpprint-mediasizes.7 gimpprint-mediasources.7 \
-gimpprint-mediatypes.7 gimpprint-models.7 gimpprint-resolutions.7 \
-ijsgimpprint.1 cups-calibrate.8
-man1dir = $(mandir)/man1
-man3dir = $(mandir)/man3
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-MANS = $(man_MANS)
-
-NROFF = nroff
-DIST_COMMON =  Makefile.am Makefile.in cups-calibrate.8.in escputil.1.in \
-gimpprint-color.7.in gimpprint-config.1.in gimpprint-dithers.7.in \
-gimpprint-imagetypes.7.in gimpprint-inktypes.7.in \
-gimpprint-mediasizes.7.in gimpprint-mediasources.7.in \
-gimpprint-mediatypes.7.in gimpprint-models.7.in \
-gimpprint-resolutions.7.in gimpprint.3.in ijsgimpprint.1.in
+all: all-am
 
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-escputil.1: $(top_builddir)/config.status escputil.1.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint.3: $(top_builddir)/config.status gimpprint.3.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint-config.1: $(top_builddir)/config.status gimpprint-config.1.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint-color.7: $(top_builddir)/config.status gimpprint-color.7.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint-dithers.7: $(top_builddir)/config.status gimpprint-dithers.7.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint-imagetypes.7: $(top_builddir)/config.status gimpprint-imagetypes.7.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint-inktypes.7: $(top_builddir)/config.status gimpprint-inktypes.7.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint-mediasizes.7: $(top_builddir)/config.status gimpprint-mediasizes.7.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint-mediasources.7: $(top_builddir)/config.status gimpprint-mediasources.7.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint-mediatypes.7: $(top_builddir)/config.status gimpprint-mediatypes.7.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint-models.7: $(top_builddir)/config.status gimpprint-models.7.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gimpprint-resolutions.7: $(top_builddir)/config.status gimpprint-resolutions.7.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-ijsgimpprint.1: $(top_builddir)/config.status ijsgimpprint.1.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-cups-calibrate.8: $(top_builddir)/config.status cups-calibrate.8.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-install-man1:
-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
 	  esac; \
 	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-	done
-
-uninstall-man1:
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  man/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+cups-calibrate.8: $(top_builddir)/config.status $(srcdir)/cups-calibrate.8.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+cups-genppd.8: $(top_builddir)/config.status $(srcdir)/cups-genppd.8.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+cups-genppdconfig.8: $(top_builddir)/config.status $(srcdir)/cups-genppdconfig.8.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+cups-genppdupdate.8: $(top_builddir)/config.status $(srcdir)/cups-genppdupdate.8.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+escputil.1: $(top_builddir)/config.status $(srcdir)/escputil.1.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ijsgutenprint.1: $(top_builddir)/config.status $(srcdir)/ijsgutenprint.1.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
 	  esac; \
 	done; \
 	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
-	done
-
-install-man3:
-	$(mkinstalldirs) $(DESTDIR)$(man3dir)
-	@list='$(man3_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.3*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
-	done
-
-uninstall-man3:
-	@list='$(man3_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.3*) list="$$list $$i" ;; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
 	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
-
-install-man7:
-	$(mkinstalldirs) $(DESTDIR)$(man7dir)
-	@list='$(man7_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
-	    *.7*) list="$$list $$i" ;; \
+	    *.1*) list="$$list $$i" ;; \
 	  esac; \
 	done; \
 	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man7dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man7dir)/$$inst; \
-	done
-
-uninstall-man7:
-	@list='$(man7_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.7*) list="$$list $$i" ;; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
 	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man7dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man7dir)/$$inst; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
-
-install-man8:
-	$(mkinstalldirs) $(DESTDIR)$(man8dir)
-	@list='$(man8_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+install-man8: $(man8_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.8*) list="$$list $$i" ;; \
 	  esac; \
@@ -374,125 +452,183 @@ install-man8:
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
-
 uninstall-man8:
-	@list='$(man8_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+	@$(NORMAL_UNINSTALL)
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.8*) list="$$list $$i" ;; \
 	  esac; \
 	done; \
 	for i in $$list; do \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
-install-man: $(MANS)
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-man1 install-man3 install-man7 \
-	 install-man8
-uninstall-man:
-	@$(NORMAL_UNINSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man3 uninstall-man7 \
-	 uninstall-man8
 tags: TAGS
 TAGS:
 
+ctags: CTAGS
+CTAGS:
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = man
 
 distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	$(mkdir_p) $(distdir)/../scripts
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
+all-am: Makefile $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
 install-exec: install-exec-am
-
-install-data-am: install-man
 install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-man
-uninstall: uninstall-am
-all-am: Makefile $(MANS)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3 \
-		$(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
-
 
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
 
-clean: clean-am
+dvi: dvi-am
 
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
+dvi-am:
 
-distclean: distclean-am
+html: html-am
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man: install-man1 install-man8
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
 
-.PHONY: install-man1 uninstall-man1 install-man3 uninstall-man3 \
-install-man7 uninstall-man7 install-man8 uninstall-man8 install-man \
-uninstall-man tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+uninstall-am: uninstall-info-am uninstall-man
+
+uninstall-man: uninstall-man1 uninstall-man8
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool 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-man1 \
+	install-man8 install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-info-am \
+	uninstall-man uninstall-man1 uninstall-man8
 
 
 @SET_MAKE@
 
-# EXTRA_DIST = $(man_MANS)
+export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+export STP_DATA_PATH = $(top_srcdir)/src/main
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
 
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/man/cups-calibrate.8.in b/man/cups-calibrate.8.in
index 093d673..fe19d81 100644
--- a/man/cups-calibrate.8.in
+++ b/man/cups-calibrate.8.in
@@ -1,5 +1,5 @@
-.\" $Id: cups-calibrate.8.in,v 1.2.8.2 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <roger@whinlatter.uklinux.net>
+.\" $Id: cups-calibrate.8.in,v 1.8 2004/09/17 18:38:02 rleigh Exp $
+.\" Copyright (C) 2000-2004 Roger Leigh <rleigh@debian.org>
 .\"
 .\" 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
@@ -14,21 +14,21 @@
 .\" 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.
-.TH CUPS\-CALIBRATE "8" "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
+.TH CUPS\-CALIBRATE "8" "@RELEASE_DATE@" "Version @GUTENPRINT_VERSION@" "Gutenprint Manual Pages"
 .SH NAME
 cups\-calibrate \- ESP CUPS Printer Calibration Tool
 .SH SYNOPSIS
 .B cups\-calibrate
 .SH DESCRIPTION
 This program allows you to calibrate the color output of printers using the
-\fBGimp-Print\fR \fICUPS\fR or \fIESP Print Pro\fR drivers.
+\fBGutenprint\fR \fICUPS\fR or \fIESP Print Pro\fR drivers.
 .PP
-Please note that this program \fBonly\fP works with the \fBGimp-Print\fR
-\fICUPS\fR or \fIESP Print Pro\fR drivers. If you are using the Gimp-Print
+Please note that this program \fBonly\fP works with the \fBGutenprint\fR
+\fICUPS\fR or \fIESP Print Pro\fR drivers. If you are using the Gutenprint
 \fIstp\fR or \fIijsgimmprint\fR driver for GhostScript or the drivers for the
-Gimp-Print plug-in for \fIThe GIMP\fR, the calibration will not work.
+Gutenprint Print plug-in for \fIThe GIMP\fR, the calibration will not work.
 .PP
-These drivers are identified by the text \fICUPS+GIMP\-print\fR or \fIESP Print
+These drivers are identified by the text \fICUPS+Gutenprint\fR or \fIESP Print
 Pro\fR in the model description displayed by the CUPS web interface, KUPS, the
 ESP Print Pro Printer Manager, or printerdrake.
 .PP
@@ -44,7 +44,7 @@ This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License, version 2, as
 published by the Free Software Foundation.
 .PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net).
+This manual page was written by Roger Leigh (rleigh@debian.org).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/man/cups-genppd.8.in b/man/cups-genppd.8.in
new file mode 100644
index 0000000..51bfc42
--- /dev/null
+++ b/man/cups-genppd.8.in
@@ -0,0 +1,119 @@
+.\" $Id: cups-genppd.8.in,v 1.5 2004/09/17 18:38:02 rleigh Exp $
+.\" Copyright (C) 2000-2004 Roger Leigh <rleigh@debian.org>
+.\"
+.\" 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.
+.TH CUPS\-GENPPD "8" "@RELEASE_DATE@" "Version @GUTENPRINT_VERSION@" "Gutenprint Manual Pages"
+.SH NAME
+cups\-genppd \- generate Gutenprint PPD files for use with CUPS
+.SH SYNOPSIS
+.B cups\-genppd
+[\fI\-c localedir\fR] [\fI\-l locale\fR] [\fI\-p prefix\fR] [\fI\-q\fR]
+[\fI\-v\fR] \fImodel1\fR \fI[model2, ...modeln]\fR
+.br
+.B cups\-genppd
+\fI\-L \fR[\fI\-c localedir\fR]
+.br
+.B cups\-genppd
+\fI\-M \fR[\fI\-v\fR]
+.br
+.B cups\-genppd
+\fI\-h\fR
+.br
+.B cups\-genppd
+\fI\-V\fR
+.SH DESCRIPTION
+\fBcups\-genppd\fR generates \fIGutenprint\fR PPD files for use with CUPS.
+The default behavior is to output PPD files for all models of printer
+that the \fIGutenprint\fR printer driver library supports.  You may
+restrict the models by listing either the driver names or the full names
+of the printers you wish to generate PPD files for after any options.
+Additionally, the PPD files may be \fIlocalised\fR, that is,
+translated, to use your native language rather than US English.  There
+are commands to find out what printer models and languages are
+supported.
+.SH EXAMPLES
+.TP
+.B cups\-genppd \-v bjc\-6200 'EPSON Stylus Photo 1280' 'HP DeskJet 850C'
+verbosely generate three PPD files, listing the driver name in the
+first case, and the full name in the second.
+.TP
+.B LANG=de_DE genppd \-p ppd \-c /usr/share/locale
+generate PPDs for all available models, in directory \fIppd\fR using
+the locale data found under \fI/usr/share/locale\fR.  The language to
+use is taken from the environment (de_DE).
+.TP
+.B cups\-genppd \-L \-c /usr/local/share/locale
+list available languages using the locale data found under
+\fI/usr/local/share/locale\fR.
+.TP
+.B cups\-genppd \-M \-v
+list available drivers, with long model descriptions
+.SH COMMANDS
+.TP
+\fB\-h\fR
+show a help message
+.TP
+\fB\-L\fR
+list available translations (message catalogs).  If a locale is used
+for which there is not a corresponding translation, then then US
+English will be used.
+.TP
+\fB\-M\fR
+list available printer models.  By default, only driver names are
+listed; if verbose mode is used, the full model name will also be
+printed
+.TP
+\fB\-V\fR
+show version information and defaults
+.IP
+The default behavior is to output PPDs if no command is given.
+.SH OPTIONS
+.TP
+\fB\-c\fR \fIlocaledir\fR
+use \fIlocaledir\fR as the base directory for locale data
+.TP
+\fB\-l\fR \fIlocale\fR
+output PPDs translated with messages for \fIlocale\fR.  Note that \fIlocale\fR
+\fBmust\fR be a locale as shown by \fIlocale \-a\fR.  For example, the \fIde\fR
+translation is used by the \fIde_DE\fR locale; \fIde\fR alone will not work.
+.TP
+\fB\-p\fR \fIprefix\fR
+output PPDs in directory \fIprefix\fR.  Directories are \fBnot\fR recursively
+created.
+.TP
+\fB\-q\fR
+Quiet mode.
+.TP
+\fB\-v\fR
+Verbose mode.
+.TP
+.B models
+a list of printer models, either the driver or quoted full name.
+.SH SEE ALSO
+CUPS Software Administrators Manual, http://localhost:631/documentation.html
+.SH COPYRIGHT
+Copyright \(co  1992\-2002 Michael Sweet (mike@easysw.com)
+.PP
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2, as
+published by the Free Software Foundation.
+.PP
+This manual page was written by Roger Leigh (rleigh@debian.org).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/man/cups-genppdconfig.8.in b/man/cups-genppdconfig.8.in
new file mode 100644
index 0000000..946f5c0
--- /dev/null
+++ b/man/cups-genppdconfig.8.in
@@ -0,0 +1,63 @@
+.\" $Id: cups-genppdconfig.8.in,v 1.6 2004/09/17 18:38:02 rleigh Exp $
+.\" Copyright (C) 2000-2004 Roger Leigh <rleigh@debian.org>
+.\"
+.\" 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.
+.TH CUPS\-GENPPDCONFIG "8" "@RELEASE_DATE@" "Version @GUTENPRINT_VERSION@" "Gutenprint Manual Pages"
+.SH NAME
+cups\-genppdconfig \- a user-friendly interface to generate Gutenprint PPD files for use with CUPS
+.SH SYNOPSIS
+.B cups\-genppdconfig
+[\fI\-d ppd_directory\fR]
+.br
+.B update\-cups\-genppd
+[\fI\-d pdd_directory\fR]
+.SH DESCRIPTION
+\fBcups\-genppdconfig\fR generates \fIGutenprint\fR PPD files for use with CUPS.
+The program allows the selection of the base directory to create the PPDs in,
+and the printers and languages desired.  The default settings are taken from
+the contents of the base directory.  Note that unselecting an item will
+\fBnot\fP remove it from the disk; you must remove unwanted printers and
+languages by deleting the files and directories respectively.
+.PP
+If \fBdialog\fP is installed, it will be used to create the user interface,
+using colour, 3D-look dialog boxes etc.  If dialog cannot be found, perlmenu
+will be used instead to create a simpler, though functionally identical,
+interface.
+.SH OPTIONS
+.TP
+.B \-d \fIppd-directory\fP
+Use \fIppd-directory\fP as the base directory to create PPD files in.  The
+default printer and language selections will also be obtained from this
+directory.  By default, the base directory is
+\fP@cups_conf_datadir@/model/gutenprint\fP.
+.SH SEE ALSO
+.BR cups\-genppd (8),
+.BR cups\-genppdupdate (8),
+.BR dialog (1),
+CUPS Software Administrators Manual, http://localhost:631/documentation.html
+.SH COPYRIGHT
+Copyright \(co  2002\-2003 Roger Leigh (rleigh@debian.org)
+.PP
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2, as
+published by the Free Software Foundation.
+.PP
+This manual page was written by Roger Leigh (rleigh@debian.org).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/man/cups-genppdupdate.8.in b/man/cups-genppdupdate.8.in
new file mode 100644
index 0000000..80804f0
--- /dev/null
+++ b/man/cups-genppdupdate.8.in
@@ -0,0 +1,73 @@
+.\" $Id: cups-genppdupdate.8.in,v 1.4 2004/09/17 18:38:02 rleigh Exp $
+.\" Copyright (C) 2000 Roger Leigh <rleigh@debian.org>
+.\"
+.\" 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.
+.TH CUPS\-GENPPDUPDATE "8" "@RELEASE_DATE@" "Version @GUTENPRINT_VERSION@" "Gutenprint Manual Pages"
+.SH NAME
+cups\-genppdupdate \- update CUPS+Gutenprint PPD files
+.SH SYNOPSIS
+.B cups\-genppdupdate
+[\fI\-h\fP]
+[\fI\-n\fP]
+[\fI\-q\fP | \fI\-v\fP]
+[\fI\-s ppd-directory\fP]
+.SH DESCRIPTION
+\fBcups\-genppdupdate\fP regenerates the \fIGutenprint\fP PPD files in use by
+CUPS, using the PPD files under \fI@cups_conf_datadir@/model/gutenprint\fP as
+templates.  The new PPD file replaces the old PPD file under
+\fI@cups_conf_serverroot@/ppd\fP, but all the options set in the old PPD will
+be merged into the new PPD, provided that they are still valid in the new file.
+.PP
+cups\-genppdupdate does \fBnot\fP restart cupsd.  cupsd will need manually
+reloading (or send SIGHUP) once cups\-genppdupdate has completed.
+.SH OPTIONS
+.TP
+.B \-h
+Show a help message.
+.TP
+.B \-n
+No action.  The program will run, but the old PPD files will not be replaced.
+.TP
+.B \-q
+Quiet mode.  No messages will be issued, apart from errors.
+.TP
+.B \-v
+Verbose mode.  More informative messages will be issued.  Note that extremely
+verbose output may be turned on by setting $debug=1 in the source, but this
+output will not be of use to the average user.
+.TP
+.B \-s \fIppd-directory\fP
+Use \fIppd-directory\fP as the base directory to read PPD files from.  By
+default, the base directory is \fP@cups_conf_datadir@/model/gutenprint\fP.
+Under this directory, the PPD files are located in subdirectories according to
+language code and territory.
+.SH SEE ALSO
+.BR cups\-genppd (8),
+.BR cups\-genppdconfig (8),
+CUPS Software Administrators Manual, http://localhost:631/documentation.html
+.SH COPYRIGHT
+Copyright \(co  2002\-2003 Roger Leigh (rleigh@debian.org)
+.PP
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License, version 2, as
+published by the Free Software Foundation.
+.PP
+This manual page was written by Roger Leigh (rleigh@debian.org).
+.\"#
+.\"# The following sets edit modes for GNU EMACS
+.\"# Local Variables:
+.\"# mode:nroff
+.\"# fill-column:79
+.\"# End:
diff --git a/man/escputil.1.in b/man/escputil.1.in
index a25cc31..b447c5f 100644
--- a/man/escputil.1.in
+++ b/man/escputil.1.in
@@ -1,4 +1,4 @@
-.\" $Id: escputil.1.in,v 1.4.4.5 2003/08/22 23:31:56 rleigh Exp $
+.\" $Id: escputil.1.in,v 1.11 2004/09/17 18:38:02 rleigh Exp $
 .\" Copyright (C) 2000-2002 Robert Krawitz <rlk@alum.mit.edu>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 .\" 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.
-.TH ESCPUTIL 1 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
+.TH ESCPUTIL 1 "@RELEASE_DATE@" "Version @GUTENPRINT_VERSION@" "Gutenprint Manual Pages"
 .SH NAME
 escputil \- maintain Epson Stylus inkjet printers
 .SH SYNOPSIS
@@ -72,7 +72,7 @@ device.
 .B \-o, \-\-align\-color
 Align the color print head (used by Stylus Color 480 and 580 only).  CAUTION:
 Misuse of this option may result in poor print quality and/or damage to the
-printer.
+printer.   
 .TP
 .B \-s, \-\-status
 Retrieve printer status.
@@ -115,7 +115,7 @@ 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.
 .SH OTHER INFORMATION
-The homepage of the Gimp-Print project from which this utility was
+The homepage of the Gutenprint project from which this utility was
 contributed is located at http://gimp\-print.sourceforge.net/.
 .SH "SEE ALSO"
 .BR lp (4),
diff --git a/man/gimpprint-color.7.in b/man/gimpprint-color.7.in
deleted file mode 100644
index 722bc21..0000000
--- a/man/gimpprint-color.7.in
+++ /dev/null
@@ -1,106 +0,0 @@
-.\" t
-.\" $Id: gimpprint-color.7.in,v 1.1.6.2 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <roger@whinlatter.uklinux.net>
-.\"
-.\" 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.
-.TH GIMPPRINT\-COLOR 7 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-gimpprint\-color \- Gimp-Print color balancing
-.SH DESCRIPTION
-Gimp-Print includes several color balancing controls.  These may be
-used to adjust the original image's brightness and contrast and gamma,
-and the density and saturation of the output, as well as the
-individual cyan, magenta and yellow levels.
-.SH COLOR BALANCING
-.TP
-.B Cyan
-.TP
-.B Magenta
-.TP
-.B Yellow
-The range of values is 0.0 \- 4.0, and defaults to 1.0.  These three
-options allow specification of the cyan, magenta, and yellow levels
-independently, for rebalancing the levels.  Normally, these should be
-adjusted to yield neutral gray, but they can be used for other
-effects.
-.TP
-.B Brightness
-The range of values is 0.0 \- 2.0, and defaults to 1.0.  This adjusts
-the brightness of the image.  0.0 gives a fully black image; 2.0 gives
-a fully white image.  Values greater than 1 will result in black not
-being solid and highlights turning white; values less than 1 will
-result in white not being perfectly clear and shadows turning black.
-.TP
-.B Contrast
-The range of values is 0.0 \- 4.0, and defaults to 1.0.  Adjust the
-contrast of the image.  0.0 gives a solid gray for the entire image,
-the exact gray depending upon the brightness chosen.
-.TP
-.B Gamma
-The range of values is 0.1 \- 4.0, and defaults to 1.0.  Adjust the
-gamma of the image, over and above the printer-specific correction.
-Gamma less than 1.0 will result in a darker image; gamma greater than
-1.0 will result in a lighter image.  Unlike brightness, gamma
-adjustment does not change the endpoints; it merely changes the shape
-of the input\(->output curve.
-.TP
-.B Density
-The range of values is 0.1 \- 2.0, and defaults to 1.0.  Adjust the
-amount of ink deposited on the paper.  If you've chosen the correct
-paper type and you're getting ink bleeding through the paper or
-puddling, try reducing the density to the lowest value you can while
-still achieving solid black.  If you're not getting solid black, even
-with the contrast and brightness at 1.0, try increasing the density.
-.IP
-All of the printers supported here actually need less than 100% ink density in
-most cases, so the actual density is something other than the nominal density
-setting.  The effective density setting cannot go above 100%, so if a value
-specified will result in an excessively high density level, it will be silently
-limited to 1.0.
-.TP
-.B Saturation
-The range of values is 0.0 \- 9.0, and defaults to 1.0.  Adjust the
-brilliance of colors.  0.0 results in pure grayscale; using this with
-Color=1 is one way of getting grayscale (see below under "Color" for a
-full discussion).  Saturation of less than 1.0 results in more muted
-colors; saturation of greater than 1.0 results in more vibrant colors.
-Very high saturation often results in very strange effects, including
-posterization and banding that might not be expected.  For normal
-purposes, the saturation should generally be less than 1.5.
-.SH COPYRIGHT
-Copyright \(co 2001 Michael Sweet (mike@easysw.com) and Robert Krawitz
-(rlk@alum.mit.edu)
-.PP
-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.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net)
-.SH SEE ALSO
-.BR gimpprint\-dithers (7),
-.BR gimpprint\-imagetypes (7),
-.BR gimpprint\-inktypes (7),
-.BR gimpprint\-mediasizes (7),
-.BR gimpprint\-mediasources (7),
-.BR gimpprint\-mediatypes (7),
-.BR gimpprint\-models (7),
-.BR gimpprint\-resolutions (7).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/gimpprint-config.1.in b/man/gimpprint-config.1.in
deleted file mode 100644
index 6fcd6ae..0000000
--- a/man/gimpprint-config.1.in
+++ /dev/null
@@ -1,79 +0,0 @@
-'\" t
-.\" $Id: gimpprint-config.1.in,v 1.2.8.2 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <rl117@york.ac.uk>
-.\"
-.\" 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.
-.hy 0
-.TH GIMP\-PRINT 1 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "GIMP Manual Pages"
-
-.SH NAME
-gimpprint\-config \- script to get information about the installed version of gimpprint
-
-.SH SYNOPSIS
-.B gimpprint\-config
-[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags]
-
-.SH DESCRIPTION
-.PP
-\fIgimpprint\-config\fP is a tool that is used to determine the compiler and
-linker flags that should be used to compile and link programs that use
-\fIGimp-Print\fP. It is also used internally to the .m4 macros for GNU autoconf
-that are included with \fIGimp-Print\fP.
-
-.SH OPTIONS
-\fIgimpprint\-config\fP accepts the following options:
-.TP 8
-.B  \-\-version
-Print the currently installed version of \fIGimp-Print\fP on the standard output.
-.TP 8
-.B  \-\-libs
-Print the linker flags that are necessary to link a \fIGimp-Print\fP program.
-.TP 8
-.B  \-\-cflags
-Print the compiler flags that are necessary to compile a \fIGimp-Print\fP program.
-.TP 8
-.B  \-\-prefix=PREFIX
-If specified, use PREFIX instead of the installation prefix that \fIGimp-Print\fP
-was built with when computing the output for the \-\-cflags and
-\-\-libs options. This option is also used for the exec prefix
-if \-\-exec\-prefix was not specified. This option must be specified
-before any \-\-libs or \-\-cflags options.
-.TP 8
-.B  \-\-exec\-prefix=PREFIX
-If specified, use PREFIX instead of the installation exec prefix that
-\fIGimp-Print\fP was built with when computing the output for the \-\-cflags
-and \-\-libs options.  This option must be specified before any
-\-\-libs or \-\-cflags options.
-
-.SH COPYRIGHT
-Copyright \(co  2001 Roger Leigh
-
-This manual page is based on the gtk\-config(1) manual page by Owen Taylor.
-
-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.
-
-.SH SEE ALSO
-.BR autoconf (1),
-.BR gtk\-config (1),
-
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/gimpprint-dithers.7.in b/man/gimpprint-dithers.7.in
deleted file mode 100644
index d6307c2..0000000
--- a/man/gimpprint-dithers.7.in
+++ /dev/null
@@ -1,103 +0,0 @@
-.\" t
-.\" $Id: gimpprint-dithers.7.in,v 1.1.6.2 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <roger@whinlatter.uklinux.net>
-.\"
-.\" 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.
-.TH GIMPPRINT\-DITHERS 7 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-gimpprint\-dithers \- Gimp-Print dither algorithms
-.SH DESCRIPTION
-Gimp-Print includes several dither algorithms.  Dithering attempts to reproduce
-various shades of gray (or all colors) from only a few different inks (black,
-cyan, magenta, yellow, and sometimes light cyan and light magenta).  The dots
-can't vary in darkness or size (except for certain special printers), and so we
-need to lay down a certain fraction of dots to represent each distinct level.
-Different dither algorithms are suited to different purposes, and some are
-significantly faster than others.
-.SH DITHER ALGORITHMS
-.TS
-li li
-lb l.
-Dither Algorithm	Description
-_
-Adaptive	Adaptive Hybrid
-EvenTone	EvenTone screening (experimental)  
-Ordered	Ordered 
-Fast	Fast
-VeryFast	Very Fast
-Floyd	Hybrid Floyd-Steinberg
-.TE
-.PP
-For the highest quality, we recommend use of \fIAdaptive Hybrid\fP dithering.
-For continuous tone images, \fIOrdered\fP works just as well and is somewhat
-faster.  Ordered dithering yields noticeably inferior results with text and
-intricate line art, particularly at high resolutions.
-.PP
-\fIEvenTone\fP dithering is a relatively new screening technology developed by
-Raph Levien.  It offers superior smoothness in highlights and midtones, and
-increased accuracy in shadows, resulting in significantly improved results
-overall.  The version of EvenTone dithering that we are using is enhanced with
-some additional improvements we have made.  It currently only operates with
-CMYK (4, 6, or 7 color output) with RGB input, and should be considered
-experimental.  Note that it is patented (see US patent 5917614), but it is
-licensed for use with GPL software.  See http://www.levien.com/patents.html for
-more information.
-.PP
-\fIFast\fP dithering, which is a simplified version of ordered dither, is
-significantly faster, but color accuracy is worse, particularly on six color
-printers and printer using variable dot sizes.  On simple four color printers,
-the quality is quite reasonable, although color printing will show more
-speckling in dark tones than Ordered dither.  For single dot size printers,
-printing grayscale, this algorithm yields almost identical results to Ordered
-with some performance improvement.  On three color printers, the results should
-be very similar to Ordered.
-.PP
-\fIVery Fast\fP is even faster than Fast, with even more loss of quality.  It
-shows even more speckling, and the output is heavily patterned.  On laser
-printers, and possibly on certain kinds of text and line art, Very Fast
-dithering may actually yield the best quality.
-.PP
-\fIError diffusion\fP algorithms (\fIHybrid Floyd-Steinberg\fP is such an
-algorithm) perform very well at high densities, and are capable of rendering
-very fine detail well, but they tend to exhibit artifacts in the form of
-"waves" or "worms" of dots which results in noticeable texturing in pale areas.
-Furthermore, pale areas immediately adjacent to white take a while to "build
-up" sufficient error to print at all.  This is sometimes called "tearing".  Its
-use is not recommended.
-.SH COPYRIGHT
-Copyright \(co 2001 Michael Sweet (mike@easysw.com) and Robert Krawitz
-(rlk@alum.mit.edu)
-.PP
-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.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net)
-.SH SEE ALSO
-.BR gimpprint\-color (7),
-.BR gimpprint\-imagetypes (7),
-.BR gimpprint\-inktypes (7),
-.BR gimpprint\-mediasizes (7),
-.BR gimpprint\-mediasources (7),
-.BR gimpprint\-mediatypes (7),
-.BR gimpprint\-models (7),
-.BR gimpprint\-resolutions (7).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/gimpprint-imagetypes.7.in b/man/gimpprint-imagetypes.7.in
deleted file mode 100644
index 2a93cb6..0000000
--- a/man/gimpprint-imagetypes.7.in
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" t
-.\" $Id: gimpprint-imagetypes.7.in,v 1.2.4.2 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <roger@whinlatter.uklinux.net>
-.\"
-.\" 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.
-.TH GIMPPRINT\-IMAGETYPES 7 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-gimpprint\-imagetypes \- Gimp-Print image types
-.SH DESCRIPTION
-Gimp-Print includes several image types which can be used to optimise
-the dither, depending on the type of image you wish to print.
-.SH IMAGE TYPE
-Possible values are:
-.PP
-.TS
-li li
-lb lw(4i).
-Value	Description
-_
-1	T{
-.na
-Line art (color or gray scale)
-T}
-2	T{
-Primarily solid colors or smooth gradients (color or gray scale)
-T}
-3	T{
-Continuous-tone photographs (color or gray scale)
-T}
-.TE
-.PP
-Option \fI0\fP is the fastest.  It generates strong, but not particularly
-accurate, colors.  There may be some fairly sharp color transitions in this
-mode.
-.PP
-Option \fI1\fP generates more accurate colors, but is slower.
-.PP
-Option \fI2\fP generates the most accurate colors, but is considerably slower.
-.PP
-Note that any of the modes may be used with either color or black & white
-output.  If black and white output is requested, but a color mode used,
-composite color will be printed.  This generally offers smoother tone, but less
-purity of gray or black, than pure black ink.  Furthermore, it is possible to
-tune the color of the gray (to achieve warmer or cooler effects) using the
-color controls in this fashion.
-.SH COPYRIGHT
-Copyright \(co 2001 Michael Sweet (mike@easysw.com) and Robert Krawitz
-(rlk@alum.mit.edu)
-.PP
-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.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net)
-.SH SEE ALSO
-.BR gimpprint\-color (7),
-.BR gimpprint\-dithers (7),
-.BR gimpprint\-inktypes (7),
-.BR gimpprint\-mediasizes (7),
-.BR gimpprint\-mediasources (7),
-.BR gimpprint\-mediatypes (7),
-.BR gimpprint\-models (7),
-.BR gimpprint\-resolutions (7).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/gimpprint-inktypes.7.in b/man/gimpprint-inktypes.7.in
deleted file mode 100644
index 426319b..0000000
--- a/man/gimpprint-inktypes.7.in
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" t
-.\" $Id: gimpprint-inktypes.7.in,v 1.1.6.2 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <roger@whinlatter.uklinux.net>
-.\"
-.\" 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.
-.TH GIMPPRINT\-INKTYPES 7 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-gimpprint\-inktypes \- Gimp-Print inkset types
-.SH DESCRIPTION
-Gimp-Print supports many different inksets, which are printer type specific.
-The option names are case sensitive.  Two names are listed for each resolution;
-the first (short) name is the \fIinktype\fP, and the second (long) name is
-descriptive.  Not all ink types are supported on all printers.
-.SH INK TYPES
-.SS Epson and Lexmark (other than the 4076) printers
-Six color printers can print using four color inks or all six colors.  Six
-color mode is recommended for photographs.  Four color mode may be useful when
-printing text with embedded graphics to reduce ink consumption, or to print
-higher quality with Ordered, Fast, or Very Fast dithering (see below).
-.PP
-The "Composite" modes use only color inks (no black) to produce all colors and
-black.  These ink types are rarely useful, but on certain types of paper they
-may produce a smoother image than that produced by mixing black ink in.  The
-Epson Stylus Color 1500 cannot mix black ink with colored inks; on this
-printer, Three Color Composite must be used.
-.PP
-.TS
-li li
-lb lw(4i).
-Ink Type	Description
-_
-Photo7	T{
-.na
-Seven Color Photo (CcMmYKk, for the Epson Stylus Photo 2100 and 2200, and
-Stylus Pro 7600 and 9600)
-T}
-PhotoCMYK	Six Color Photo
-PhotoCMY	Five Color Photo Composite
-CMYK	Four Color Standard
-RGB	Three Color Composite
-Quadtone	T{
-Quadtone grayscale inks (special third party inksets designed to produce
-superior results for grayscale images)
-T}
-Gray2	T{
-Two Level Grayscale (Kk, for the Epson stylus Photo 2100 and 2200, and Stylus
-Pro 7600 and 9600)
-.ad
-T}
-.TE
-.SS Canon printers
-.TS
-li li
-lb l.
-Ink Type	Description
-_
-Gray	Black
-RGB	Color
-CMYK	Black/Color
-PhotoCMY	Photo/Color
-PhotoCMYK	Photo
-.TE
-.SS PCL (Hewlett-Packard and Lexmark 4076) color printers
-.TS
-li li
-lb l.
-Ink Type	Description
-_
-CMYK	Color + Black Cartridges
-Photo	Color + Photo Cartridges (For Deskjet 69x only)
-.TE
-.PP
-Black and white PCL printers (laser printers, in particular) do not
-allow any value to be specified for the ink type.
-.SH COPYRIGHT
-Copyright \(co 2001 Michael Sweet (mike@easysw.com) and Robert Krawitz
-(rlk@alum.mit.edu)
-.PP
-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.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net)
-.SH SEE ALSO
-.BR gimpprint\-color (7),
-.BR gimpprint\-dithers (7),
-.BR gimpprint\-imagetypes (7),
-.BR gimpprint\-mediasizes (7),
-.BR gimpprint\-mediasources (7),
-.BR gimpprint\-mediatypes (7),
-.BR gimpprint\-models (7),
-.BR gimpprint\-resolutions (7).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/gimpprint-mediasizes.7.in b/man/gimpprint-mediasizes.7.in
deleted file mode 100644
index 92b5cf5..0000000
--- a/man/gimpprint-mediasizes.7.in
+++ /dev/null
@@ -1,258 +0,0 @@
-.\" t
-.\" $Id: gimpprint-mediasizes.7.in,v 1.1.6.3 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <roger@whinlatter.uklinux.net>
-.\"
-.\" 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.
-.TH GIMPPRINT\-MEDIASIZES 7 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-gimpprint\-mediasizes \- Gimp-Print media sizes
-.SH DESCRIPTION
-Gimp-Print supports many different media (paper) sizes.  All of the currently
-supported media sizes are listed below.  The default media size is "Letter".
-.SH MEDIA SIZES
-.SS Common English paper sizes
-.TS
-li li li li li
-lb l l n n.
-Media Size	Description	Comment	x\fR(pt)\fP	y\fR(pt)\fP
-_
-Letter	Letter	8.5in x 11in	612	792
-Legal	Legal	8.5in x 14in	612	1008
-Tabloid	Tabloid	11in x 17in	792	1224
-Executive	Executive	7.25in x 10.5in	522	756
-Postcard	Postcard	100mm x 147mm	283	416
-w216h360	3x5		216	360
-w288h432	4x6		288	432
-w324h495	Epson 4x6 Photo Paper		324	495
-w360h504	5x7		360	504
-w360h576	5x8		360	576
-8x10	8x10		576	720
-Statement	Manual	5.5in x 8.5in	396	612
-TabloidExtra	12x18		864	1296
-SuperB	13x19		936	1368
-.TE
-.SS Common photographic paper sizes
-.TS
-li li li li li
-lb l l n n.
-Media Size	Description	Comment	x\fR(pt)\fP	y\fR(pt)\fP
-_
-w576h864	8x12	Sometimes used for 35 mm	576	864
-w792h1008	11x14		792	1008
-w1152h1440	16x20		1152	1440
-w1152h1728	16x24	20x24 for 35 mm	1152	1728
-w1440h1728	20x24		1440	1728
-w1440h2160	20x30	24x30 for 35 mm	1440	2160
-w1728h2160	24x30		1728	2160
-w1728h2592	24x36	Sometimes used for 35 mm	1728	2592
-w2160h2880	30x40		2160	2880
-.TE
-.SS International Paper Sizes (mostly taken from BS4000:1968)
-"A" series: Paper and boards, trimmed sizes.
-.PP
-"A" sizes are in the ratio 1 : sqrt(2).  A0 has a total area
-of 1 square metre.  Everything is rounded to the nearest
-millimetre.  Thus, A0 is 841mm x 1189mm.  Every other A
-size is obtained by doubling or halving another A size.
-.PP
-.TS
-li li li li li
-lb l l n n.
-Media Size	Description	Comment	x\fR(pt)\fP	y\fR(pt)\fP
-_
-w4768h6749	4A	1682mm x 2378mm	4768	6749
-w3370h4768	2A	1189mm x 1682mm	3370	4768
-A0	A0	841mm x 1189mm	2384	3370
-A1	A1	594mm x  841mm	1684	2384
-A2	A2	420mm x  594mm	1191	1684
-A3	A3	297mm x  420mm	842	1191
-A4	A4	210mm x  297mm	595	842
-A5	A5	148mm x  210mm	420	595
-A6	A6	105mm x  148mm	297	420
-A7	A7	74mm x  105mm	210	297
-A8	A8	52mm x   74mm	148	210
-A9	A9	37mm x   52mm	105	148
-A10	A10	26mm x   37mm	73	105
-.T&
-li s s s s.
-Stock sizes for normal trims.  Allowance for trim is 3 millimetres.
-.T&
-lb l l n n.
-w2437h3458	RA0	860mm x 1220mm	2437	3458
-w1729h2437	RA1	610mm x  860mm	1729	2437
-w1218h1729	RA2	430mm x  610mm	1218	1729
-w864h1218	RA3	305mm x  430mm	864	1218
-w609h864	RA4	215mm x  305mm	609	864
-.T&
-li s s s s.
-Stock sizes for bled work or extra trims.
-.T&
-lb l l n n.
-w2551h3628	SRA0	900mm x 1280mm	2551	3628
-w1814h2551	SRA1	640mm x  900mm	1814	2551
-w1275h1814	SRA2	450mm x  640mm	1275	1814
-w907h1275	SRA3	320mm x  450mm	907	1275
-w637h907	SRA4	225mm x  320mm	637	907
-.TE
-.PP
-"B" series: Posters, wall charts and similar items.
-.PP
-.TS
-li li li li li
-lb l l n n.
-Media Size	Description	Comment	x\fR(pt)\fP	y\fR(pt)\fP
-_
-w5669h8016	4B ISO	2000mm x 2828mm	5669	8016
-w4008h5669	2B ISO	1414mm x 2000mm	4008	5669
-ISOB0	B0 ISO	1000mm x 1414mm	2834	4008
-ISOB1	B1 ISO	707mm x 1000mm	2004	2834
-ISOB2	B2 ISO	500mm x  707mm	1417	2004
-ISOB3	B3 ISO	353mm x  500mm	1000	1417
-ISOB4	B4 ISO	250mm x  353mm	708	1000
-ISOB5	B5 ISO	176mm x  250mm	498	708
-ISOB6	B6 ISO	125mm x  176mm	354	498
-ISOB7	B7 ISO	88mm x  125mm	249	354
-ISOB8	B8 ISO	62mm x   88mm	175	249
-ISOB9	B9 ISO	44mm x   62mm	124	175
-ISOB10	B10 ISO	31mm x   44mm	87	124
-B0	B0 JIS		2919	4127
-B1	B1 JIS		2063	2919
-B2	B2 JIS		1459	2063
-B3	B3 JIS		1029	1459
-B4	B4 JIS		727	1029
-B5	B5 JIS		518	727
-B6	B6 JIS		362	518
-B7	B7 JIS		257	362
-B8	B8 JIS		180	257
-B9	B9 JIS		127	180
-B10	B10 JIS		90	127
-.TE
-.PP
-"C" series: Envelopes or folders suitable for A size stationery.
-.PP
-.TS
-li li li li li
-lb l l n n.
-Media Size	Description	Comment	x\fR(pt)\fP	y\fR(pt)\fP
-_
-C0	C0	917mm x 1297mm	2599	3676
-C1	C1	648mm x  917mm	1836	2599
-C2	C2	458mm x  648mm	1298	1836
-C3	C3	324mm x  458mm	918	1298
-C4	C4	229mm x  324mm	649	918
-C5	C5	162mm x  229mm	459	649
-w354h918	B6\-C4	125mm x  324mm	354	918
-C6	C6	114mm x  162mm	323	459
-DL	DL	110mm x  220mm	311	623
-w229h459	C7\-6	81mm x  162mm	229	459
-C7	C7	81mm x  114mm	229	323
-C8	C8	57mm x   81mm	161	229
-C9	C9	40mm x   57mm	113	161
-C10	C10	28mm x   40mm	79	113
-.TE
-.SS US CAD standard paper sizes
-.PP
-.TS
-li li li li li
-lb l l n n.
-Media Size	Description	Comment	x\fR(pt)\fP	y\fR(pt)\fP
-_
-ARCHA	ArchA	9x12in	648	864
-ARCHA_transverse	ArchA transverse	12x9in	864	648
-ARCHB	ArchB	12x18in	864	1296
-ARCHB_transverse	ArchB transverse	18x12in	1296	864
-ARCHC	ArchC	18x24in	1296	1728
-ARCHC_transverse	ArchC transverse	24x18in	1728	1296
-ARCHD	ArchD	24x36in	1728	2592
-ARCHD_transverse	ArchD transverse	36x24in	2592	1728
-ARCHE	ArchE	36x48in	2592	3456
-ARCHE_transverse	ArchE transverse	48x36in	3456	2592
-.TE
-.SS Foolscap
-.TS
-li li li li li
-lb l l n n.
-Media Size	Description	Comment	x\fR(pt)\fP	y\fR(pt)\fP
-_
-w612h936	American foolscap		612	936
-w648h936	European foolscap		648	936
-.TE
-.SS Sizes for book production
-The BPIF and the Publishers Association jointly recommend ten standard metric
-sizes for case-bound titles as follows:
-.PP
-.TS
-li li li li li
-lb l l n n.
-Media Size	Description	Comment	x\fR(pt)\fP	y\fR(pt)\fP
-_
-w535h697	Crown Quarto	189mm x 246mm	535	697
-w569h731	Large Crown Quarto	201mm x 258mm	569	731
-w620h782	Demy Quarto	219mm x 276mm	620	782
-w671h884	Royal Quarto	237mm x 312mm	671	884
-w348h527	Crown Octavo	123mm x 186mm	348	527
-w365h561	Large Crown Octavo	129mm x 198mm	365	561
-w391h612	Demy Octavo	138mm x 216mm	391	612
-w442h663	Royal Octavo	156mm x 234mm	442	663
-.TE
-.SS Paperback sizes in common usage
-.TS
-li li li li li
-lb l l n n.
-Media Size	Description	Comment	x\fR(pt)\fP	y\fR(pt)\fP
-_
-w314h504	Small paperback	111mm x 178mm	314	504
-w314h513	Penguin small paperback	111mm x 181mm	314	513
-w365h561	Penguin large paperback	129mm x 198mm	365	561
-.TE
-.SS Miscellaneous sizes
-.TS
-li li li li li
-lb l l n n.
-Media Size	Description	Comment	x\fR(pt)\fP	y\fR(pt)\fP
-_
-w283h420	Hagaki Card	100 x 148 mm	283	420
-w420h567	Oufuku Card	148 x 200 mm	420	567
-w340h666	Long 3	Japanese long envelope #3	340	666
-w255h581	Long 4	Japanese long envelope #4	255	581
-w680h941	Kaku	Japanese Kaku envelope #4	680	941
-COM10	Commercial 10	US Commercial 10 env	297	684
-w315h414	A2 Invitation	US A2 invitation	315	414
-.TE
-.SH COPYRIGHT
-Copyright \(co 2001 Michael Sweet (mike@easysw.com) and Robert Krawitz
-(rlk@alum.mit.edu)
-.PP
-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.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net)
-.SH SEE ALSO
-.BR gimpprint\-color (7),
-.BR gimpprint\-dithers (7),
-.BR gimpprint\-imagetypes (7),
-.BR gimpprint\-inktypes (7),
-.BR gimpprint\-mediasources (7),
-.BR gimpprint\-mediatypes (7),
-.BR gimpprint\-models (7),
-.BR gimpprint\-resolutions (7).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/gimpprint-mediasources.7.in b/man/gimpprint-mediasources.7.in
deleted file mode 100644
index 0f01273..0000000
--- a/man/gimpprint-mediasources.7.in
+++ /dev/null
@@ -1,104 +0,0 @@
-.\" t
-.\" $Id: gimpprint-mediasources.7.in,v 1.1.6.2 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <roger@whinlatter.uklinux.net>
-.\"
-.\" 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.
-.TH GIMPPRINT\-MEDIASOURCES 7 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-gimpprint\-mediasources \- Gimp-Print media sources
-.SH DESCRIPTION
-Gimp-Print supports many different media sources, which vary according to the
-specific capabilities of each printer model.  The available media sources are
-listed below.
-.SH MEDIA SOURCES
-.SS Epson printers
-.TS
-li li
-lb lw(4i).
-Media Source	Description
-_
-Standard	Standard
-Roll	T{
-.na
-Roll Feed (for certain Stylus Photo and Stylus Pro models only)
-.ad
-T}
-.TE
-.SS Canon printers
-.TS
-li li
-lb l.
-Media Source	Description
-_
-Auto	Auto Sheet Feeder
-Manual	Manual with Pause
-ManualNP	Manual without Pause
-.TE
-.SS PCL (Hewlett-Packard and Lexmark 4076) printers
-Different printers allow different choices out of this set.
-.PP
-.TS
-li li
-lb l.
-Media Source	Description
-_
-Standard	Standard (Feed from printer defined source)
-Manual	Manual
-MultiPurpose	Tray 1
-Upper	Tray 2
-Lower	Tray 3
-LargeCapacity	Tray 4
-Portable	Portable Sheet Feeder
-Desktop	Desktop Sheet Feeder
-Tray	Tray
-Tray2	Tray 2
-Optional	Optional Source
-Auto	Autoselect
-.TE
-.SS Lexmark printers (other than the 4076)
-.TS
-li li
-lb l.
-Media Source	Description
-_
-Auto	Auto Sheet Feeder
-Manual	Manual with Pause
-ManualNP	Manual without Pause
-.TE
-.SH COPYRIGHT
-Copyright \(co 2001 Michael Sweet (mike@easysw.com) and Robert Krawitz
-(rlk@alum.mit.edu)
-.PP
-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.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net)
-.SH SEE ALSO
-.BR gimpprint\-color (7),
-.BR gimpprint\-dithers (7),
-.BR gimpprint\-imagetypes (7),
-.BR gimpprint\-inktypes (7),
-.BR gimpprint\-mediasizes (7),
-.BR gimpprint\-mediatypes (7),
-.BR gimpprint\-models (7),
-.BR gimpprint\-resolutions (7).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/gimpprint-mediatypes.7.in b/man/gimpprint-mediatypes.7.in
deleted file mode 100644
index 2971908..0000000
--- a/man/gimpprint-mediatypes.7.in
+++ /dev/null
@@ -1,115 +0,0 @@
-.\" t
-.\" $Id: gimpprint-mediatypes.7.in,v 1.1.6.2 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <roger@whinlatter.uklinux.net>
-.\"
-.\" 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.
-.TH GIMPPRINT\-MEDIATYPES 7 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-gimpprint\-mediatypes \- Gimp-Print media types
-.SH DESCRIPTION
-Gimp-Print supports many different media types, which are printer type
-specific.  The option names are case sensitive.  Two names are listed for each
-resolution; the first (short) name is the \fImediatype\fP, and the second
-(long) name is descriptive.  Not all media types are supported on all printers.
-.SH MEDIA TYPES
-.SS Epson and Lexmark (other than the 4076) inkjet printers
-.TS
-li li
-lb l.
-Media Type	Description
-_
-Plain	Plain Paper
-PlainFast	Plain Paper Fast Load
-Postcard	Postcard
-GlossyFilm	Glossy Film
-Transparency	Transparencies
-Envelope	Envelopes
-BackFilm	Back Light Film
-Matte	Matte Paper
-Inkjet	Inkjet Paper
-Coated	Photo Quality Inkjet Paper
-GlossyPhoto	Premium Glossy Photo Paper
-Luster	Premium Luster Photo Paper
-Photo	Photo Paper
-Glossy	Photo Quality Glossy Paper
-Ilford	Ilford Heavy Paper
-Other	Other
-.TE
-.PP
-We have found that glossy photo papers not specifically designed for Epson
-printers generally perform poorly in Epson printers.  The ink tends to pool on
-the paper, causing muddy shadows and possibly leaving ink on the printer
-rollers.  Use of the highest quality printing modes (1440x720 highest quality
-and 2880x720 unidirectional) produces the best result on such papers, probably
-because printing is slower and there is more time for the ink to dry.
-.SS Canon printers
-.TS
-li li
-lb l.
-Media Type	Description
-_
-Plain	Plain Paper
-Transparency	Transparencies
-BackFilm	Back Print Film
-Fabric	Fabric Sheets
-Envelope	Envelope
-Coated	High Resolution Paper
-TShirt	T-Shirt Transfers
-GlossyFilm	High Gloss Film
-GlossyPaper	Glossy Photo Paper
-GlossyCards	Glossy Photo Cards
-GlossyPro	Photo Paper Pro
-.TE
-.SS PCL (Hewlett-Packard and Lexmark 4076) inkjet printers
-.TS
-li li
-lb l.
-Media Type	Description
-_
-Plain	Plain
-Bond	Bond
-Premium	Premium
-Glossy	Glossy/Photo
-Transparency	Transparency
-GlossyQD	Quick-dry Photo
-TransparencyQD	Quick-dry Transparency
-.TE
-.PP
-PCL laser printers do not allow specification of any media type.
-.SH COPYRIGHT
-Copyright \(co 2001 Michael Sweet (mike@easysw.com) and Robert Krawitz
-(rlk@alum.mit.edu)
-.PP
-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.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net)
-.SH SEE ALSO
-.BR gimpprint\-color (7),
-.BR gimpprint\-dithers (7),
-.BR gimpprint\-imagetypes (7),
-.BR gimpprint\-inktypes (7),
-.BR gimpprint\-mediasizes (7),
-.BR gimpprint\-mediasources (7),
-.BR gimpprint\-models (7),
-.BR gimpprint\-resolutions (7).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/gimpprint-models.7.in b/man/gimpprint-models.7.in
deleted file mode 100644
index 41f5195..0000000
--- a/man/gimpprint-models.7.in
+++ /dev/null
@@ -1,248 +0,0 @@
-.\" t
-.\" $Id: gimpprint-models.7.in,v 1.1.6.4 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <roger@whinlatter.uklinux.net>
-.\"
-.\" 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.
-.TH GIMPPRINT\-MODELS 7 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-gimpprint\-models \- Gimp-Print printer drivers
-.SH DESCRIPTION
-Gimp-Print supports many different printer models specific.  The option names
-are case sensitive.
-.SH PRINTER MODELS
-.TS
-li li
-lb l.
-Model name	Description
-_
-bjc\-30	CANON BJC 30
-bjc\-50	CANON BJC 50
-bjc\-55	CANON BJC 55
-bjc\-80	CANON BJC 80
-bjc\-85	CANON BJC 85
-bjc\-210	CANON BJC 210
-bjc\-240	CANON BJC 240
-bjc\-250	CANON BJC 250
-bjc\-1000	CANON BJC 1000
-bjc\-2000	CANON BJC 2000
-bjc\-3000	CANON BJC 3000
-bjc\-4300	CANON BJC 4300
-bjc\-4400	CANON BJC 4400 photo
-bjc\-6000	CANON BJC 6000
-bjc\-6100	CANON BJC 6100
-bjc\-7000	CANON BJC 7000
-bjc\-7100	CANON BJC 7100
-bjc\-8200	CANON BJC 8200
-bjc\-s400	CANON S400
-bjc\-s450	CANON S450
-bjc\-s800	CANON S800
-bjc\-s4500	CANON S4500
-escp2\-c20sx	EPSON Stylus C20SX
-escp2\-c20ux	EPSON Stylus C20UX
-escp2\-c40sx	EPSON Stylus C40SX
-escp2\-c40ux	EPSON Stylus C40UX
-escp2\-c41sx	EPSON Stylus C41SX
-escp2\-c41ux	EPSON Stylus C41UX
-escp2\-c42sx	EPSON Stylus C42SX
-escp2\-c42ux	EPSON Stylus C42UX
-escp2\-c60	EPSON Stylus C60
-escp2\-c61	EPSON Stylus C61
-escp2\-c62	EPSON Stylus C62
-escp2\-c70	EPSON Stylus C70
-escp2\-c80	EPSON Stylus C80
-escp2\-c82	EPSON Stylus C82
-escp2	EPSON Stylus Color
-escp2\-pro	EPSON Stylus Color Pro
-escp2\-pro\-xl	EPSON Stylus Color Pro XL
-escp2\-400	EPSON Stylus Color 400
-escp2\-440	EPSON Stylus Color 440
-escp2\-460	EPSON Stylus Color 460
-escp2\-480	EPSON Stylus Color 480
-escp2\-500	EPSON Stylus Color 500
-escp2\-580	EPSON Stylus Color 580
-escp2\-600	EPSON Stylus Color 600
-escp2\-640	EPSON Stylus Color 640
-escp2\-660	EPSON Stylus Color 660
-escp2\-670	EPSON Stylus Color 670
-escp2\-680	EPSON Stylus Color 680
-escp2\-740	EPSON Stylus Color 740
-escp2\-760	EPSON Stylus Color 760
-escp2\-777	EPSON Stylus Color 777
-escp2\-800	EPSON Stylus Color 800
-escp2\-850	EPSON Stylus Color 850
-escp2\-860	EPSON Stylus Color 860
-escp2\-880	EPSON Stylus Color 880
-escp2\-83	EPSON Stylus Color 83
-escp2\-900	EPSON Stylus Color 900
-escp2\-980	EPSON Stylus Color 980
-escp2\-1160	EPSON Stylus Color 1160
-escp2\-1500	EPSON Stylus Color 1500
-escp2\-1520	EPSON Stylus Color 1520
-escp2\-3000	EPSON Stylus Color 3000
-escp2\-photo	EPSON Stylus Photo
-escp2\-700	EPSON Stylus Photo 700
-escp2\-ex	EPSON Stylus Photo EX
-escp2\-ex3	EPSON Stylus Photo EX3
-escp2\-720	EPSON Stylus Photo 720
-escp2\-750	EPSON Stylus Photo 750
-escp2\-780	EPSON Stylus Photo 780
-escp2\-785	EPSON Stylus Photo 785EPX
-escp2\-790	EPSON Stylus Photo 790
-escp2\-810	EPSON Stylus Photo 810
-escp2\-820	EPSON Stylus Photo 820
-escp2\-830	EPSON Stylus Photo 830
-escp2\-870	EPSON Stylus Photo 870
-escp2\-875	EPSON Stylus Photo 875
-escp2\-890	EPSON Stylus Photo 890
-escp2\-895	EPSON Stylus Photo 895
-escp2\-915	EPSON Stylus Photo 915
-escp2\-925	EPSON Stylus Photo 925
-escp2\-950	EPSON Stylus Photo 950
-escp2\-960	EPSON Stylus Photo 960
-escp2\-1200	EPSON Stylus Photo 1200
-escp2\-1270	EPSON Stylus Photo 1270
-escp2\-1280	EPSON Stylus Photo 1280
-escp2\-1290	EPSON Stylus Photo 1290
-escp2\-2000	EPSON Stylus Photo 2000P
-escp2\-2100	EPSON Stylus Photo 2100
-escp2\-2200	EPSON Stylus Photo 2200
-escp2\-5000	EPSON Stylus Pro 5000
-escp2\-5500	EPSON Stylus Pro 5500
-escp2\-7000	EPSON Stylus Pro 7000
-escp2\-7500	EPSON Stylus Pro 7500
-escp2\-7600	EPSON Stylus Pro 7600
-escp2\-9000	EPSON Stylus Pro 9000
-escp2\-9500	EPSON Stylus Pro 9500
-escp2\-9600	EPSON Stylus Pro 9600
-escp2\-10000	EPSON Stylus Pro 10000
-escp2\-scan2000	EPSON Stylus Scan 2000
-escp2\-scan2500	EPSON Stylus Scan 2500
-escp2\-cx3200	EPSON Stylus CX-3200
-escp2\-cx5200	EPSON Stylus CX-5200
-escp2\-cl700	EPSON CL-700
-escp2\-cl750	EPSON CL-750
-escp2\-em900c	EPSON EM-900C
-escp2\-em930c	EPSON EM-930C
-escp2\-mc10000	EPSON MC-10000
-escp2\-mc2000	EPSON MC-2000
-escp2\-mc5000	EPSON MC-5000
-escp2\-mc7000	EPSON MC-7000
-escp2\-mc9000	EPSON MC-9000
-escp2\-mj930c	EPSON MJ-930C
-escp2\-mj5100c	EPSON MJ-5100C
-escp2\-mj6000c	EPSON MJ-6000C
-escp2\-mj8000c	EPSON MJ-8000C
-escp2\-pm10000	EPSON PM-10000
-escp2\-pm2000c	EPSON PM-2000C
-escp2\-pm2200c	EPSON PM-2200C
-escp2\-pm3000c	EPSON PM-3000C
-escp2\-pm3300c	EPSON PM-3300C
-escp2\-pm3500c	EPSON PM-3500C
-escp2\-pm4000px	EPSON PM-4000PX
-escp2\-pm5000c	EPSON PM-5000C
-escp2\-pm7000c	EPSON PM-7000C
-escp2\-pm700c	EPSON PM-700C
-escp2\-pm730c	EPSON PM-730C
-escp2\-pm750c	EPSON PM-750C
-escp2\-pm760c	EPSON PM-760C
-escp2\-pm770c	EPSON PM-770C
-escp2\-pm780c	EPSON PM-780C
-escp2\-pm790pt	EPSON PM-790PT
-escp2\-pm800c	EPSON PM-800C
-escp2\-pm850pt	EPSON PM-850PT
-escp2\-pm880c	EPSON PM-880C
-escp2\-pm9000c	EPSON PM-9000C
-escp2\-pm950c	EPSON PM-950C
-escp2\-px7000	EPSON PX-7000
-escp2\-px9000	EPSON PX-9000
-pcl\-desnj\-230	HP DesignJet 230
-pcl\-desnj\-250	HP DesignJet 250
-pcl\-desnj\-430	HP DesignJet 430
-pcl\-desnj\-450	HP DesignJet 450
-pcl\-desnj\-455	HP DesignJet 455
-pcl\-desnj\-488	HP DesignJet 488
-pcl\-desnj\-700	HP DesignJet 700
-pcl\-750	HP DesignJet 750C
-pcl\-desnj\-250	HP DesignJet 2500
-pcl\-desnj\-350	HP DesignJet 3500
-pcl\-340	HP DeskJet 340
-pcl\-400	HP DeskJet 400
-pcl\-500	HP DeskJet 500
-pcl\-501	HP DeskJet 500C
-pcl\-520	HP DeskJet 520
-pcl\-540	HP DeskJet 540C
-pcl\-550	HP DeskJet 550C
-pcl\-560	HP DeskJet 560C
-pcl\-600	HP DeskJet 600/600C (Single Cartridge)
-pcl\-601	HP DeskJet 600 series (2 Cartridge)
-pcl\-690	HP DeskJet 690 series (Photo-Ink capable)
-pcl\-810	HP DeskJet 810C
-pcl\-812	HP DeskJet 812C
-pcl\-840	HP DeskJet 840C
-pcl\-842	HP DeskJet 842C
-pcl\-845	HP DeskJet 845C
-pcl\-850	HP DeskJet 850C
-pcl\-855	HP DeskJet 855C
-pcl\-870	HP DeskJet 870C
-pcl\-890	HP DeskJet 890C
-pcl\-895	HP DeskJet 895C
-pcl\-900	HP DeskJet 900 series
-pcl\-P1000	HP PhotoSmart P1000
-pcl\-1100	HP DeskJet 1100C
-pcl\-P1100	HP PhotoSmart P1100
-pcl\-1120	HP DeskJet 1120C
-pcl\-1200	HP DeskJet 1200C
-pcl\-1220	HP DeskJet 1220C
-pcl\-1600	HP DeskJet 1600C
-pcl\-2000	HP DeskJet 2000 series
-pcl\-2500	HP DeskJet 2500 series
-pcl\-2	HP LaserJet II series
-pcl\-3	HP LaserJet III series
-pcl\-4	HP LaserJet 4 series
-pcl\-4v	HP LaserJet 4V, 4Si
-pcl\-5	HP LaserJet 5 series
-pcl\-5si	HP LaserJet 5Si
-pcl\-6	HP LaserJet 6 series
-lexmark\-4076	Lexmark 4076 (PCL printer)
-lexmark\-z42	Lexmark Z42
-lexmark\-z43	Lexmark Z43
-lexmark\-z52	Lexmark Z52
-lexmark\-z53	Lexmark Z53
-.TE
-.SH COPYRIGHT
-Copyright \(co 2001 Michael Sweet (mike@easysw.com) and Robert Krawitz
-(rlk@alum.mit.edu)
-.PP
-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.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net)
-.SH SEE ALSO
-.BR gimpprint\-color (7),
-.BR gimpprint\-dithers (7),
-.BR gimpprint\-imagetypes (7),
-.BR gimpprint\-inktypes (7),
-.BR gimpprint\-mediasizes (7),
-.BR gimpprint\-mediasources (7),
-.BR gimpprint\-mediatypes (7),
-.BR gimpprint\-resolutions (7).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/gimpprint-resolutions.7.in b/man/gimpprint-resolutions.7.in
deleted file mode 100644
index 42f0a92..0000000
--- a/man/gimpprint-resolutions.7.in
+++ /dev/null
@@ -1,431 +0,0 @@
-.\" t
-.\" $Id: gimpprint-resolutions.7.in,v 1.1.6.5 2003/12/13 12:09:58 rleigh Exp $
-.\" Copyright (C) 2000 Roger Leigh <roger@whinlatter.uklinux.net>
-.\"
-.\" 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.
-.TH GIMPPRINT\-RESOLUTIONS 7 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-gimpprint\-resolutions \- Gimp-Print print resolutions
-.SH DESCRIPTION
-Gimp-Print supports many different resolutions, which are printer type
-specific.  The option names are case sensitive.  Not all resolutions are
-supported on all printers.
-.SH PRINT RESOLUTONS
-.SS Epson Stylus printers
-Within each specified resolution, the quality is generally listed from worst to
-best (and generally higher quality means lower speed).  For example, \fI360 DPI
-Unidirectional\fP is usually better than \fI360 DPI\fP.  Characteristics of
-specific models and individual printers may affect the orderings to some
-degree; on many printers, with certain papers, unidirectional printing will
-improve quality substantially more than using an otherwise better quality
-printing mode.
-.PP
-The difference between different quality settings lies in the number
-of passes made over each line.  "High" and "Highest" quality settings
-perform more passes, printing fewer dots with each pass over the same
-line and using different nozzles for each pass.  This reduces banding
-effects, but requires more time.
-.PP
-\fIInterleave\fP modes use algorithms within the printer to generate the
-sequence of rows printed.  These algorithms generally only work well at low
-printing resolutions.  Many printers do not support this kind of printing at
-resolutions of 720 DPI and above, and some printers that do actually print just
-one row (using just one nozzle per color) at a time.  While this particular use
-will produce extremely high quality (no banding whatsoever, normally), it is
-extremely slow and may eventually damage the print head due to ink pooling.
-All printers that we are aware of have no such trouble at 360 DPI.
-.PP
-We generally recommend the following resolutions for the following
-purposes:
-.PP
-.IP
-.TS
-li li.
-Resolution	Recommended use
-_
-.T&
-lb lw(4i)
-lb ^.
-360x90	T{
-.na
-Fast economy draft output on plain paper (output will be very banded and not
-very dark).
-T}
-360x120	
-.T&
-lb l.
-180	T{
-Economy draft output on plain paper (output will not be very dark).
-T}
-.T&
-lb l
-lb ^.
-360x180	T{
-Draft output on plain paper (output will not be solidly black); economy draft
-output on good quality inkjet paper.
-T}
-360x240	
-.T&
-lb l.
-360	T{
-Standard quality output on plain paper (output will be solidly black); draft
-output on good quality inkjet paper.
-T}
-720x360	T{
-High quality output on plain paper; standard output on good
-quality inkjet paper.
-T}
-720	T{
-Maximum quality on plain paper; high quality on good inkjet paper; proofs on
-photo-quality paper.  On many printers, there will be little difference between
-this and 720x360 on plain paper.
-T}
-1440x720	T{
-High quality on photo paper; use 1440x720 Highest Quality to reduce
-microbanding if needed.  While this will work on plain paper, it usually offers
-little improvement over 720 DPI.
-T}
-2880x720	T{
-Highest quality on photo paper.  While this may yield slightly improved
-quality, it will generally not be markedly superior to 1440x720 Highest
-Quality, except on the Stylus Color 980 and Stylus C70 and C80, where it may
-yield a noticeable improvement.  It takes as long to print as 1440x720 highest
-quality, but twice as long to generate the output.
-T}
-1440x1440	T{
-An unsupported mode that offers higher quality than 2880x720 for certain types
-of images on very high quality paper.  It does not appear to offer any
-advantage on smooth tones, but fine detail (particularly vertical, and to a
-lesser extent near-horizontal) it shows noticeable improvement.  It takes as
-long to print as 2880x720.  1440x1440 highest quality takes twice as long to
-print.
-T}
-2880x1440	T{
-An unsupported mode that may offer higher quality than 2880x720 for certain
-types of images on very high quality paper.  Experiments conducted thus far
-demonstrate little if any improvement over 1440x1440.  It takes twice as long
-to print as 2880x720 or 1440x1440, and as long to print as 1440x1440 highest
-quality.
-.ad
-T}
-.TE
-.PP
-The following resolutions are supported on printers other than the
-Stylus Pro (5000, 5500, 7000, 7500, 9000, 9500, and 10000) printers.
-Resolutions for those printers are listed in a later section.  Please
-see the notes at the end of this section.
-.PP
-.TS
-li li li
-lb l l.
-Quality	Description	Note
-_
-360x90dpi	360 x 90 DPI Fast Economy Draft	(1)
-180dpi	180 DPI Economy Draft	(2)
-360x180dpi	360 x 180 DPI Draft	(2)
-360x180sw	360 x 180 DPI Draft	(3)
-360x120dpi	360 x 120 DPI Economy Draft	(4)
-360x120sw	360 x 120 DPI Economy Draft	(5)
-360x240dpi	360 x 240 DPI Draft	(4)
-360x240sw	360 x 240 DPI Draft	(5)
-360dpi	360 DPI	(6)
-360uni	360 DPI Unidirectional	(6)
-360mw	360 DPI Interleave	(6, *)
-360mwuni	360 DPI Interleave Unidirectional	(6)
-360sw	360 DPI	(7, 17, *)
-360swuni	360 DPI Unidirectional	(7, 17)
-360hq	360 DPI High Quality	(7, 8, 17)
-360hquni	360 DPI High Quality Unidirectional	(7, 8, 17)
-720x360sw	720 x 360 DPI	(9, 10)
-720x360swuni	720 x 360 DPI Unidirectional	(9, 10)
-720mw	720 DPI Interleave	(11)
-720mwuni	720 DPI Interleave Unidirectional	(11)
-720sw	720 DPI	(9)
-720swuni	720 DPI Unidirectional	(9)
-720hq	720 DPI High Quality	(9)
-720hquni	720 DPI High Quality Unidirectional	(9)
-720hq2	720 DPI Highest Quality	(9)
-1440x720mw	1440 x 720 DPI Interleave	(12)
-1440x720mwuni	1440 x 720 DPI Interleave Unidirectional	(12)
-1440x720sw	1440 x 720 DPI	(13)
-1440x720swuni	1440 x 720 DPI Unidirectional	(13, 14)
-1440x720hq	1440 x 720 DPI Highest Quality	(13)
-2880x720sw	2880 x 720 DPI	(15)
-2880x720swuni	2880 x 720 DPI Unidirectional	(15)
-1440x1440sw	1440 x 1440 DPI	(16)
-1440x1440hq2	1440 x 1440 DPI Highest Quality	(16)
-2880x1440sw	2880 x 1440 DPI	(16)
-.TE
-.IP *
-This resolution is the default on all printers supporting this setting.
-.IP 1
-Works on printers that have a basic vertical spacing of 1/90".  This includes
-the Stylus Color, Stylus Color 440, 460, 600, 640, 660, 670, and 1500, and
-Stylus Photo, Stylus Photo 700, 720, and EX.
-.IP 2
-Works on most printers that have a basic vertical spacing of 1/90, 1/180, or
-1/360 inch.  This includes Stylus Color, Stylus Color 440, 460, 600, 640, 660,
-670, 800, 850, 900, 980, 1500, 1520, 3000, and Stylus Photo, Stylus Photo 700,
-720 and EX.
-.IP 3
-Works on Stylus C70, C80, and C82; and Stylus Photo 950, 960, 2100, and 2200.
-.IP 4
-Works on older printers with dot spacing of 1/120 inch.  This includes the
-Stylus Color Pro, Pro XL, 400, and 500.
-.IP 5
-Works on newer printers with dot spacing of 1/120 inch.  This includes the
-Stylus C20, C40, C41, C42, C60, C61, and C62; the Stylus Color 480, 580, 680,
-740, 760, 777, 860, 880, 83, and 1160, and the Stylus Photo 750, 780, 785, 790,
-810, 820, 825, 830, 870, 875, 890, 895, 915, 925, 1270, 1280, 1290, and 2000P,
-and the Stylus Scan 2000 and 2500.
-.IP 6
-Works on all printers that do not support variable drop sizes.  This includes
-the Stylus Color, Stylus Color 400, 440, 460, 500, 600, 640, 660, 800, 850,
-1500, 1520, and 3000, Stylus Color Pro, Stylus Color Pro XL, and Stylus Photo,
-Stylus Photo 700, and EX.
-.IP 7
-Works on all printers that do support variable drop sizes.  This includes all
-supported Epson Stylus printers except for those listed in note (6).
-.IP 8
-Recommended only on processors slower than 200 MHz, the system is heavily
-loaded with a faster processor, or if problems are experienced at 720x360.
-.IP 9
-Works on all supported printers except for Stylus Color, Stylus Color Pro,
-Stylus Color Pro XL, Stylus Color 1500, 1520, and 3000.
-.IP 10
-On printers that do not support variable drop size (see note (4)), this will
-print as fast as 360 DPI, and faster than 360 DPI High Quality.  It will take
-twice as long to generate output, which may be important on a heavily loaded
-system or a processor slower than 200 MHz.
-.IP 11
-Works on some older printers, including the Stylus Color, Stylus Color 400,
-500, 600, 800, 850, 1500, 1520, and 3000, Stylus Color Pro, and Stylus Color
-Pro XL.  Not recommended except for the Stylus Color, Stylus Color 1500, 1520,
-and 3000.
-.IP 12
-Works on Stylus Color 600, 800, 850, 1520, and 3000.  Not recommended unless
-other 1440x720 modes do not work.
-.IP 13
-Works on all printers that support 1440x720 DPI.  This includes all supported
-printers except for the Stylus Color, Stylus Color Pro, Pro XL, 400, 440, 460,
-480, 500, and 1500, and Stylus Photo.  In addition, this may not work correctly
-on Stylus Color 1520 and Stylus Color 3000.
-.IP 14
-This is identical to 1440 x 720 Highest Quality (1440x720hq) on the Stylus
-Color 900.
-.IP 15
-Works on all printers that support 2880x720 DPI.  This includes the Stylus C60,
-C61, C62, C70, C80, and C82, the Stylus Color 680, 777, 880, 83, and 980, and
-Stylus Photo 780, 790, 810, 820, 825, 830, 890, 915, 925, 950, 960, 1280, and 1290.
-This resolution is offered on the Stylus Photo 2100 and 2200, but may not work
-correctly.
-.IP 16
-Works on Epson Stylus Photo 825, 830, 925, 950, 960, 2100, 2200; Stylus C61,
-C62, C70, C80, C82 ; Stylus Pro 7600 and 9600.  This resolution is not
-supported by Epson on the C70 and C80, but it works correctly on at least some
-such printers.
-.IP 17
-These resolutions print at particularly high speed on the Epson Stylus Photo
-950, 960, 2100, and 2200 when printing in Four Color Standard or Three Color
-Composite modes, or when printing in monochrome or grayscale with any ink type
-other than Two Level Grayscale, Seven Color Photo, or Quadtone.
-.PP
-The Stylus Pro printers (Stylus Pro 5000, 5500, 7000, 7500, 7600,
-9000, 9500, 9600, and 10000) support additional interleave modes known
-as Full Overlap (FOL), Four Pass, and FOL2.  The Stylus Pro 5500,
-7500, 7600, 9500, 9600, and 10000 additionally have a mode called MW2.
-These modes can only be used at certain resolutions.  Stylus Pro
-printers support the following resolutions:
-.PP
-.TS
-li li
-lb l.
-Quality	Description
-_
-180dpi	180 DPI
-360dpi	360 DPI
-360uni	360 DPI Unidirectional
-360mw	360 DPI Interleave
-360mwuni	360 DPI Interleave Unidirectional
-360fol	360 DPI Full Overlap
-360foluni	360 DPI Full Overlap Unidirectional
-360fol2	360 DPI FOL2
-360fol2uni	360 DPI FOL2 Unidirectional
-360mw2	360 DPI MW2
-360mw2uni	360 DPI MW2 Unidirectional
-720x360dpi	720 x 360 DPI
-720x360uni	720 x 360 DPI Unidirectional
-720x360fol	720 x 360 DPI FOL
-720x360foluni	720 x 360 DPI FOL Unidirectional
-720x360fol2	720 x 360 DPI FOL2
-720x360fol2uni	720 x 360 DPI FOL2 Unidirectional
-720x360mw2	720 x 360 DPI MW2
-720x360mw2uni	720 x 360 DPI MW2 Unidirectional
-720dpi	720 DPI
-720uni	720 DPI Unidirectional
-720mw	720 DPI Interleave
-720mwuni	720 DPI Interleave Unidirectional
-720fol	720 DPI Full Overlap
-720foluni	720 DPI Full Overlap Unidirectional
-720fourp	720 DPI Four Pass
-720fourpuni	720 DPI Four Pass Unidirectional
-1440x720dpi	1440 x 720 DPI
-1440x720uni	1440 x 720 DPI Unidirectional
-1440x720mw	1440 x 720 DPI Interleave
-1440x720mwuni	1440 x 720 DPI Interleave Unidirectional
-1440x720fol	1440 x 720 DPI FOL
-1440x720foluni	1440 x 720 DPI FOL Unidirectional
-1440x720fourp	1440 x 720 DPI Four Pass
-1440x720fourpuni	1440 x 720 DPI Four Pass Unidirectional
-.TE
-.PP
-In addition, the Stylus Pro 7600 and 9600 printers support the
-following resolutions:
-.PP
-.TS
-li li
-lb l.
-Quality	Description
-_
-2880x720dpi	2880 x 720 DPI
-2880x720uni	2880 x 720 DPI Unidirectional
-2880x720mw	2880 x 720 DPI Interleave
-2880x720mwuni	2880 x 720 DPI Interleave Unidirectional
-2880x720fol	2880 x 720 DPI FOL
-2880x720foluni	2880 x 720 DPI FOL Unidirectional
-2880x720fourp	2880 x 720 DPI Four Pass
-2880x720fourpuni	2880 x 720 DPI Four Pass Unidirectional
-1440x1440dpi	1440 x 1440 DPI
-1440x1440uni	1440 x 1440 DPI Unidirectional
-1440x1440mw	1440 x 1440 DPI Interleave
-1440x1440mwuni	1440 x 1440 DPI Interleave Unidirectional
-1440x1440fol	1440 x 1440 DPI FOL
-1440x1440foluni	1440 x 1440 DPI FOL Unidirectional
-1440x1440fourp	1440 x 1440 DPI Four Pass
-1440x1440fourpuni	1440 x 1440 DPI Four Pass Unidirectional
-2880x1440dpi	2880 x 1440 DPI
-2880x1440uni	2880 x 1440 DPI Unidirectional
-2880x1440mw	2880 x 1440 DPI Interleave
-2880x1440mwuni	2880 x 1440 DPI Interleave Unidirectional
-2880x1440fol	2880 x 1440 DPI FOL
-2880x1440foluni	2880 x 1440 DPI FOL Unidirectional
-2880x1440fourp	2880 x 1440 DPI Four Pass
-2880x1440fourpuni	2880 x 1440 DPI Four Pass Unidirectional
-.TE
-.SS PCL printers (including Hewlett-Packard and Lexmark 4076)
-.PP
-In addition, the Stylus Pro 7600 and 9600 printers support the
-following resolutions:
-.PP
-.TS
-li li
-lb lw(3i).
-Quality	Description
-_
-150dpi	150x150 DPI (should work on all printers)
-300dpi	T{
-.na
-300x300 DPI 
-(should work on all printers, C-RET on DJ 850/855/870/890)
-T}
-600x300dpi	600x300 DPI (DJ 6xx/810/812/840/842/895)
-600mono	T{
-600x600 DPI monochrome (DJ 6xx (except 69x) /8xx/1100/1120)
-T}
-600dpi	T{
-600x600 DPI (DJ 69x/840/9xx/1220/2000/2500,
-PhotoSmart P1000/P1100, LJ5/5Si/6)
-.ad
-T}
-.TE
-.PP
-Note: the higher resolutions of newer PCL printers using "Photo-Ret" are
-not yet supported.
-.SS Lexmark printers (other than the 4076)
-.TS
-li li
-lb l.
-Quality	Description
-_
-300x600dpi	300 DPI x 600 DPI
-600dpi	600 DPI
-600hq	600 DPI high quality
-600uni	600 DPI Unidirectional
-1200dpi	1200 DPI
-1200hq	1200 DPI high quality
-1200hq2	1200 DPI highest quality
-1200uni	1200 DPI  Unidirectional
-2400x1200dpi	2400 DPI x 1200 DPI (Z52)
-2400x1200hq	2400 DPI x 1200 DPI high quality (Z52)
-2400x1200hq2	2400 DPI x 1200 DPI highest quality (Z52)
-.TE
-.SS Canon printers
-1200 DPI printers (BJC 7000, BJC 7100, BJC 8500):
-.PP
-.TS
-li li
-lb l.
-Quality	Description
-_
-300x300dpi	300x300 DPI
-300x300dmt	300x300 DPI DMT
-600x600dpi	600x600 DPI
-600x600dmt	600x600 DPI DMT
-1200x600dpi	1200x600 DPI
-1200x1200dpi	1200x1200 DPI
-.TE
-.PP
-1440 DPI printers (BJC 30, BJC 50, BJC 55, BJC 80, BJC 85, BJC 210,
-    BJC 240, BJC 250, BJC 1000, BJC 2000, BJC 3000, BJC 4300, BJC
-    4400, BJC 6000, BJC 6100, BJC 6200, BJC 6500, BJC 8200, S400,
-    S450, S800, S4500):
-.PP
-.TS
-li li
-lb l.
-Quality	Description
-_
-360x360dpi	360x360 DPI
-360x360dmt	360x360 DPI DMT
-720x360dpi	720x360 DPI
-720x720dpi	720x720 DPI
-1440x720dpi	1440x720 DPI
-1440x1440dpi	1440x1440 DPI
-.TE
-.SH COPYRIGHT
-Copyright \(co 2001 Michael Sweet (mike@easysw.com) and Robert Krawitz
-(rlk@alum.mit.edu)
-.PP
-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.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net)
-.SH SEE ALSO
-.BR gimpprint\-color (7),
-.BR gimpprint\-dithers (7),
-.BR gimpprint\-imagetypes (7),
-.BR gimpprint\-inktypes (7),
-.BR gimpprint\-mediasizes (7),
-.BR gimpprint\-mediasources (7),
-.BR gimpprint\-mediatypes (7),
-.BR gimpprint\-models (7).
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/gimpprint.3.in b/man/gimpprint.3.in
deleted file mode 100644
index c351203..0000000
--- a/man/gimpprint.3.in
+++ /dev/null
@@ -1,65 +0,0 @@
-.\" $Id: gimpprint.3.in,v 1.1.10.3 2003/08/22 23:31:56 rleigh Exp $
-.\" Copyright (C) 2000-2002 Roger Leigh <roger@whinlatter.uklinux.net>
-.\"
-.\" 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.
-.TH GIMPPRINT 3 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
-.SH NAME
-\fBgimpprint\fR \- High quality raster image printing library
-.SH SYNOPSIS
-\fB#include <gimp\-print/gimp\-print.h>\fR
-.SH DESCRIPTION
-The \fBgimpprint\fR library routines give programmers an interface to print
-high quality bitmap images on most modern printers.  It includes drivers which
-provide printing quality for UNIX/Linux on a par with proprietary
-vendor-supplied drivers in many cases, and can be used for many of the most
-demanding printing tasks.
-.SH COPYRIGHT
-Copyright \(co 2001 Michael Sweet (mike@easysw.com) and Robert Krawitz
-(rlk@alum.mit.edu)
-.PP
-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.
-.PP
-This manual page was written by Roger Leigh (roger@whinlatter.uklinux.net)
-.SH SEE ALSO
-.BR gimpprint\-color (7),
-.BR gimpprint\-dithers (7),
-.BR gimpprint\-imagetypes (7),
-.BR gimpprint\-inktypes (7),
-.BR gimpprint\-mediasizes (7),
-.BR gimpprint\-mediasources (7),
-.BR gimpprint\-mediatypes (7),
-.BR gimpprint\-models (7),
-.BR gimpprint\-resolutions (7).
-.PP
-The full documentation for
-.B Gimp-Print
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B Gimp-Print
-programs are properly installed at your site, the command
-.IP
-.B info gimp\-print
-.PP
-should give you access to the complete manual.
-.\"#
-.\"# The following sets edit modes for GNU EMACS
-.\"# Local Variables:
-.\"# mode:nroff
-.\"# fill-column:79
-.\"# End:
diff --git a/man/ijsgimpprint.1.in b/man/ijsgutenprint.1.in
index 6759f4c..0b3f73d 100644
--- a/man/ijsgimpprint.1.in
+++ b/man/ijsgutenprint.1.in
@@ -1,7 +1,7 @@
 .\" t
-.\" $Id: ijsgimpprint.1.in,v 1.1.2.5 2003/08/24 19:21:48 rleigh Exp $
+.\" $Id: ijsgutenprint.1.in,v 1.2 2005/04/18 10:54:56 rleigh Exp $
 .\" Copyright (C) 2000-2002 Robert Krawitz <rlk@alum.mit.edu>
-.\"                         Roger Leigh <roger@whinlatter.uklinux.net>
+.\"                         Roger Leigh <rleigh@debian.org>
 .\"
 .\" 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
@@ -16,13 +16,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.
-.TH IJSGIMPPRINT 1 "@RELEASE_DATE@" "Version @GIMPPRINT_VERSION@" "Gimp-Print Manual Pages"
+.TH IJSGUTENPRINT 1 "@RELEASE_DATE@" "Version @GUTENPRINT_VERSION@" "Gutenprint Manual Pages"
 .SH NAME
-ijsgimpprint \- Ghostscript driver for Gimp-Print
+ijsgutenprint \- Ghostscript driver for Gutenprint
 .SH SYNOPSIS
 .B gs
 \-sDEVICE=ijs
-\-sIjsServer=@prefix@/bin/ijsgimpprint
+\-sIjsServer=@prefix@/bin/ijsgutenprint
 \-sDeviceManufacturer=\fIvendor\fP
 \-sDeviceModel=\fIname\fP
 [ \fI\-dIjsUseOutputFD\fP ]
@@ -31,22 +31,22 @@ ijsgimpprint \- Ghostscript driver for Gimp-Print
 [ \fIfiles\fP ]
 .SH DESCRIPTION
 .PP
-.B ijsgimpprint
-provides Ghostscript with a Gimp-Print driver, supporting all printers
-supported by libgimpprint.
+.B ijsgutenprint
+provides Ghostscript with a Gutenprint driver, supporting all printers
+supported by libgutenprint.
 .PP
 IJS is an initiative to improve the quality and ease of use of printing with
 Ghostscript.  It permits adding or upgrading drivers without recompiling
 Ghostscript.  An IJS driver runs in a separate process that communicates with
-Ghostscript via an IPC channel.  The Gimp-Print IJS driver may be used with
+Ghostscript via an IPC channel.  The Gutenprint IJS driver may be used with
 AFPL Ghostscript, as it runs in a separate process.
 .PP
 The options for this driver are very complex.  We strongly recommend
 use of a printer management system such as Foomatic rather than
 configuring a spooler manually with this driver.  The driver name used
-by Foomatic is \fIgimp\-print\-ijs\fP.
+by Foomatic is \fIgutenprint\-ijs\fP.
 .SH OPTIONS
-\fIijsgimpprint\fP accepts the following options:
+\fIijsgutenprint\fP accepts the following options:
 .SS Ghostscript IJS options
 .TP
 .B \-dIjsUseOutputFD
@@ -60,53 +60,40 @@ sub-options.
 .TP
 \fB\-sDeviceManufacturer\fP=\fIvendor\fP \fB\-sDeviceModel\fP=\fIname\fP
 This option must be supplied.  There is no default.  The IJS driver requires
-the \fIvendor\fP (it's part of the protocol), but the ijsgimpprint driver
+the \fIvendor\fP (it's part of the protocol), but the ijsgutenprint driver
 ignores it.  It should be CANON, EPSON, LEXMARK, or HEWLETT\-PACKARD.  The value
 of the \-sDeviceModel parameter is the same as the value of the \-sModel
 parameter in the old stp driver.
 .IP
-A complete list of supported printers may be found in
-.BR gimpprint\-models (7).
-.IP
 Most or all of the Epson Stylus printers are fully functional.  The others
 vary.  In particular, all of the listed Epson Stylus Photo printers print in
 full 6-color photo mode; most of the others do not.  The color output has also
 been better tuned for Epson Stylus printers than for others.
-.SS Gimp-Print IJS options
+.SS Gutenprint IJS options
 These options are all used in the \-sIjsParams options, except where mentioned
 otherwise.  Due to their complicated nature, the options are explained in
 detail in their own sections.
 .SH PRINT RESOLUTION
 .TP
 \fBQuality\fP=\fIquality\fP
-The meaning of this is model-specific.  Two names are listed for each
-resolution; the first (short) name is the \fIquality\fP that must be passed to
-Quality, and the second (long) name is descriptive.  Each printer has its own
+The meaning of this is model-specific.  Each printer has its own
 default value; for most printers, this is a reasonable 300 or 360 DPI
-resolution.  A full list of available resolutions for each printer may be found
-in
-.BR gimpprint\-resolutions (7).
+resolution.
 .SH INK TYPES
 .TP
 \fBInkType\fP=\fIinktype\fP
 .PP
-This is printer type specific.  The option names are case sensitive.  A full
-list of available media types may be found in
-.BR gimmprint\-inktypes (7).
+This is printer type specific.  The option names are case sensitive.
 .SH MEDIA TYPES
 .TP
 \fBMediaType\fP=\fImediatype\fP
 .PP
-This is printer type specific.  The option names are case sensitive.  A full
-list of available media types may be found in
-.BR gimpprint\-mediatypes (7).
+This is printer type specific.  The option names are case sensitive.
 .SH MEDIA SOURCES
 .TP
 \fBMediaSource\fP=\fImediasource\fP
 .PP
-This is printer type specific.  The option names are case sensitive.  A full
-list of available media sources may be found in
-.BR gimpprint\-mediasources (7).
+This is printer type specific.  The option names are case sensitive.
 .PP
 .SH MEDIA SIZES
 .TP
@@ -118,15 +105,10 @@ where \fIx\fP and \fIy\fP are the width and height of the paper respectively,
 in points (1/72").  Note this is a normal gs option, \fInot\fP an IJS option.
 .PP
 This is printer-specific; we cannot list the correct values for each printer
-here.  The option names are case-sensitive.  Two names are listed for each
-resolution; the first (short) name is the value that must be passed to
-\-sPAPERSIZE, and the second (long) name is descriptive.  This option does not
-set GhostScript up to use a paper size other than the default; it only tells
-the driver to set up the printer for a different paper size.  The default paper
+here.  The option names are case-sensitive.  This option does not set
+GhostScript up to use a paper size other than the default; it only tells the
+driver to set up the printer for a different paper size.  The default paper
 size is "Letter".
-.PP
-A complete list of available paper sizes may be found in
-.BR gimpprint\-mediasizes (7).
 .SH COLOR BALANCING
 .TP
 \fBCyan\fP=\fIval\fP
@@ -144,15 +126,9 @@ A complete list of available paper sizes may be found in
 \fBDensity\fP=\fIval\fP
 .TP
 \fBSaturation\fP=\fIval\fP
-.PP
-A full description of the color balancing options, including the allowed ranges
-of values, may be found in
-.BR gimpprint\-color (7).
 .SH DITHERING ALGORITHMS
 .TP
 \fBDitherAlgorithm\fP=\fIalgorithm\fP
-Possible values for \fIalgorithm\fP may be found in
-.BR gimpprint\-dithers (7).
 .SH OUTPUT TYPE
 .TP
 \fB\-sProcessColorModel\fP=\fIDeviceGray\fP \fB\-dBitsPerSample\fP=1
@@ -184,7 +160,7 @@ do not use luminance.
 .PP
 CMYK output may be used with the IJS driver only.  It is useful if
 you're printing a CMYK graphic and want explicit control over the
-inks.  Generally it yields inferior quality, as Gimp-Print has good
+inks.  Generally it yields inferior quality, as Gutenprint has good
 algorithms for converting RGB (screen) into CMYK (inks) that take
 into account paper type, ink type, and other variables.  In CMYK
 mode, the brightness, contrast, and saturation controls do not
@@ -238,7 +214,7 @@ adjusting the density is a bad idea!
 .SS Example 1
 Print charts to file, using A4 paper, color, 360 dpi:
 .IP
-.B gs \-sDEVICE=ijs \-sIjsServer=@prefix@/bin/ijsgimpprint
+.B gs \-sDEVICE=ijs \-sIjsServer=@prefix@/bin/ijsgutenprint
 .br
 .B    \-sDeviceManufacturer=EPSON \-sDeviceModel=escp2\-ex
 .br
@@ -250,7 +226,7 @@ Print charts to file, using A4 paper, color, 360 dpi:
 .SS Example 2
 Print color photograph to /dev/lp0 at maximum quality:
 .IP
-.B gs \-sDEVICE=ijs \-sIjsServer=@prefix@/bin/ijsgimpprint
+.B gs \-sDEVICE=ijs \-sIjsServer=@prefix@/bin/ijsgutenprint
 .br
 .B    \-sDeviceManufacturer=EPSON \-sDeviceModel=escp2\-870
 .br
@@ -262,7 +238,7 @@ Print color photograph to /dev/lp0 at maximum quality:
 .SS Example 3
 Print pure black text to stdout:
 .IP
-.B gs \-sDEVICE=ijs \-sIjsServer=@prefix@/bin/ijsgimpprint
+.B gs \-sDEVICE=ijs \-sIjsServer=@prefix@/bin/ijsgutenprint
 .br
 .B    \-sDeviceManufacturer=EPSON \-sDeviceModel=escp2\-660
 .br
@@ -273,14 +249,15 @@ Print pure black text to stdout:
 .B    \-sIjsParams='Quality=720sw,Density=0.8' foo.ps
 .SH HISTORY
 The Ghostscript stp driver was originally written by Henryk Richter
-(buggs@comlab.uni\-rostock.de), and was integrated into Gimp-Print during the
-3.1 development series.  Gimp-Print itself was originally written by Michael
+(buggs@comlab.uni\-rostock.de), and was integrated into Gutenprint during the
+3.1 development series.  Gutenprint itself was originally written by Michael
 Sweet <mike@easysw.com>, who released up to version 2.0; Robert Krawitz
-released version 3.0.  The Gimp-Print development team
+released version 3.0.  The Gutenprint development team
 (http://gimp\-print.sourceforge.net) now maintains the entire package.
 .PP
 The IJS driver was originally written by Russell Lang, and incorporated into
-Gimp-Print in early 2002.  This driver corresponds with the IJS protocol 0.32.
+Gutenprint (known then as Gimp-Print) in early 2002.  This driver corresponds
+with the IJS protocol 0.32.
 .SH COPYRIGHT
 Copyright \(co  2001\-2002 Robert Krawitz (rlk@alum.mit.edu)
 .PP
@@ -300,17 +277,9 @@ Place - Suite 330, Boston, MA 02111-1307, USA.
 Robert Krawitz.  Originally written by Russell Lang.
 .PP
 This manual page was written by Robert Krawitz (rlk@alum.mit.edu) and Roger
-Leigh (roger@whinlatter.uklinux.net).
+Leigh (rleigh@debian.org).
 .SH SEE ALSO
-.BR gs (1),
-.BR gimpprint\-color (7),
-.BR gimpprint\-dithers (7),
-.BR gimpprint\-inktypes (7),
-.BR gimpprint\-mediasizes (7),
-.BR gimpprint\-mediasources (7),
-.BR gimpprint\-mediatypes (7),
-.BR gimpprint\-models (7),
-.BR gimpprint\-resolutions (7).
+.BR gs (1)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables: