Imported Upstream version 5.2.1

12 files changed, 272 insertions, 93 deletions

diff --git a/include/Makefile.in b/include/Makefile.in
index 24e5758..7914876 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,7 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.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
@@ -98,6 +99,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -118,6 +120,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -150,6 +153,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -170,9 +174,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -199,6 +204,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -384,8 +390,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -410,8 +416,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -421,13 +427,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index eb13929..6a8e1b2 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -46,7 +46,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.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
@@ -103,6 +104,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -123,6 +125,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -155,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -175,9 +179,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -204,6 +209,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -384,8 +390,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -397,8 +403,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -408,13 +414,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/include/gutenprint/gutenprint-intl-internal.h b/include/gutenprint/gutenprint-intl-internal.h
index 5057530..ab8c674 100644
--- a/include/gutenprint/gutenprint-intl-internal.h
+++ b/include/gutenprint/gutenprint-intl-internal.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: gutenprint-intl-internal.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: gutenprint-intl-internal.h,v 1.4 2008/08/13 07:35:51 easysw Exp $"
  *
  *   I18N header file for the gimp-print.
  *
- *   Copyright 1997-2000 Michael Sweet (mike@easysw.com),
+ *   Copyright 1997-2008 Michael Sweet (mike@easysw.com),
  *	Robert Krawitz (rlk@alum.mit.edu) and Michael Natterer (mitch@gimp.org)
  *
  *   This program is free software; you can redistribute it and/or modify it
@@ -54,20 +54,20 @@ INCLUDE_LOCALE_H
 #include <locale.h>
 #endif
 
-#if defined ENABLE_NLS && !defined DISABLE_NLS
-#    include <libintl.h>
+#if defined(ENABLE_NLS) && !defined(DISABLE_NLS)
+#  include <libintl.h>
 /** Translate String. */
-#    define _(String) dgettext (PACKAGE, String)
-#    undef gettext
+#  define _(String) dgettext (PACKAGE, String)
+#  undef gettext
 /** Translate String. */
-#    define gettext(String) dgettext (PACKAGE, String)
-#    ifdef gettext_noop
+#  define gettext(String) dgettext (PACKAGE, String)
+#  ifdef gettext_noop
 /** Mark String for translation, but don't translate it right now. */
-#        define N_(String) gettext_noop (String)
-#    else
+#      define N_(String) gettext_noop (String)
+#  else
 /** Mark String for translation, but don't translate it right now. */
 #        define N_(String) (String)
-#    endif
+#  endif
 #else /* ifndef ENABLE_NLS */
 /* Stubs that do something close enough.  */
 #    define textdomain(String) (String)
diff --git a/include/gutenprint/gutenprint-intl.h b/include/gutenprint/gutenprint-intl.h
index e859b3d..afab4a7 100644
--- a/include/gutenprint/gutenprint-intl.h
+++ b/include/gutenprint/gutenprint-intl.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: gutenprint-intl.h,v 1.2 2004/11/28 15:59:29 rleigh Exp $"
+ * "$Id: gutenprint-intl.h,v 1.5 2008/08/13 07:35:51 easysw Exp $"
  *
  *   I18N header file for Gimp-Print.
  *
- *   Copyright 1997-2000 Michael Sweet (mike@easysw.com),
+ *   Copyright 1997-2008 Michael Sweet (mike@easysw.com),
  *	Robert Krawitz (rlk@alum.mit.edu) and Michael Natterer (mitch@gimp.org)
  *
  *   This program is free software; you can redistribute it and/or modify it
@@ -52,24 +52,22 @@ INCLUDE_LOCALE_H
 #endif
 
 #ifdef ENABLE_NLS
-
-#include <libintl.h>
-#ifndef _
+#  include <libintl.h>
+#  ifndef _
 /** Translate String. */
-#define _(String) gettext (String)
-#endif
-#ifndef gettext_noop
+#    define _(String) gettext (String)
+#  endif
+#  ifndef gettext_noop
 /** Mark String for translation, but don't translate it right now. */
-#define gettext_noop(String) (String)
-#endif
-#ifdef gettext_noop
+#    define gettext_noop(String) (String)
+#  endif
+#  ifdef gettext_noop
 /** Mark String for translation, but don't translate it right now. */
-# define N_(String) gettext_noop (String)
-#else
+#    define N_(String) gettext_noop (String)
+#  else
 /** Mark String for translation, but don't translate it right now. */
-# define N_(String) (String)
-#endif
-
+#    define N_(String) (String)
+#  endif
 #else /* ifndef ENABLE_NLS */
 /* Stubs that do something close enough.  */
 #    define textdomain(String) (String)
diff --git a/include/gutenprint/mxml.h b/include/gutenprint/mxml.h
index d82a021..3e13f87 100644
--- a/include/gutenprint/mxml.h
+++ b/include/gutenprint/mxml.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: mxml.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: mxml.h,v 1.2 2008/06/08 15:10:08 rlk Exp $"
  *
  * Header file for mini-XML, a small XML-like file parsing library.
  *
@@ -141,6 +141,8 @@ extern stp_mxml_node_t	*stp_mxmlFindElement(stp_mxml_node_t *node, stp_mxml_node
 					 const char *value, int descend);
 extern stp_mxml_node_t	*stp_mxmlLoadFile(stp_mxml_node_t *top, FILE *fp,
 			              stp_mxml_type_t (*cb)(stp_mxml_node_t *));
+extern stp_mxml_node_t	*stp_mxmlLoadFromFile(stp_mxml_node_t *top, const char *file,
+			              stp_mxml_type_t (*cb)(stp_mxml_node_t *));
 extern stp_mxml_node_t	*stp_mxmlLoadString(stp_mxml_node_t *top, const char *s,
 			                stp_mxml_type_t (*cb)(stp_mxml_node_t *));
 extern stp_mxml_node_t	*stp_mxmlNewElement(stp_mxml_node_t *parent, const char *name);
@@ -154,6 +156,8 @@ extern char		*stp_mxmlSaveAllocString(stp_mxml_node_t *node,
 			        	     int (*cb)(stp_mxml_node_t *, int));
 extern int		stp_mxmlSaveFile(stp_mxml_node_t *node, FILE *fp,
 			             int (*cb)(stp_mxml_node_t *, int));
+extern int		stp_mxmlSaveToFile(stp_mxml_node_t *node, const char *fp,
+			             int (*cb)(stp_mxml_node_t *, int));
 extern int		stp_mxmlSaveString(stp_mxml_node_t *node, char *buffer,
 			               int bufsize,
 			               int (*cb)(stp_mxml_node_t *, int));
@@ -174,5 +178,5 @@ extern stp_mxml_node_t	*stp_mxmlWalkPrev(stp_mxml_node_t *node, stp_mxml_node_t
 
 
 /*
- * End of "$Id: mxml.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $".
+ * End of "$Id: mxml.h,v 1.2 2008/06/08 15:10:08 rlk Exp $".
  */
diff --git a/include/gutenprint/paper.h b/include/gutenprint/paper.h
index e9c14ed..26ee9ae 100644
--- a/include/gutenprint/paper.h
+++ b/include/gutenprint/paper.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: paper.h,v 1.2 2008/01/15 03:48:45 rlk Exp $"
+ * "$Id: paper.h,v 1.4 2008/07/12 15:05:54 rlk Exp $"
  *
  *   libgimpprint paper functions.
  *
@@ -103,31 +103,47 @@ extern int stp_known_papersizes(void);
 /**
  * Get a papersize by name.
  * @param name the short unique name of the paper.
- * @returns a pointer to the papersize, or NULL on failure.  The
- * pointer should not be freed.
+ * @returns a static pointer to the papersize, or NULL on failure.
  */
 extern const stp_papersize_t *stp_get_papersize_by_name(const char *name);
 
 /**
  * Get a papersize by size.
  * The nearest available size to the size requested will be found.
+ * Only paper sizes within 5 points of width and height will be considered.
  * @param length the length of the paper.
  * @param width the width of the paper
- * @returns a pointer to the papersize, or NULL on failure.  The
- * pointer should not be freed.
+ * @returns a static pointer to the papersize, or NULL on failure.
  */
 extern const stp_papersize_t *stp_get_papersize_by_size(int length,
 							int width);
 
 /**
+ * Get a papersize by size if an exact match is found.
+ * @param length the length of the paper.
+ * @param width the width of the paper
+ * @returns a static pointer to the papersize, or NULL on failure.
+ */
+extern const stp_papersize_t *stp_get_papersize_by_size_exact(int length,
+							      int width);
+
+/**
  * Get a papersize by its index number.
  * @param idx the index number.  This must not be greater than (total
  * number of papers - 1).
- * @returns a pointer to the papersize, or NULL on failure.  The
- * pointer should not be freed.
+ * @returns a static pointer to the papersize, or NULL on failure.
  */
 extern const stp_papersize_t *stp_get_papersize_by_index(int idx);
 
+/**
+ * Get the default paper dimensions for the current configuration.
+ * The default is derived from the PageSize parameter if set, otherwise
+ * the default page size for the printer is used.  If no value can be
+ * determined, 1x1 will be returned.
+ * @param v the Gutenprint vars object
+ * @param width pointer to storage that the width will be returned in.
+ * @param height pointer to storage that the height will be returned in.
+ */
 extern void stp_default_media_size(const stp_vars_t *v,
 				   int *width, int *height);
 
@@ -139,5 +155,5 @@ extern void stp_default_media_size(const stp_vars_t *v,
 
 #endif /* GUTENPRINT_PAPER_H */
 /*
- * End of "$Id: paper.h,v 1.2 2008/01/15 03:48:45 rlk Exp $".
+ * End of "$Id: paper.h,v 1.4 2008/07/12 15:05:54 rlk Exp $".
  */
diff --git a/include/gutenprint/path.h b/include/gutenprint/path.h
index e08c9ed..b7c4b44 100644
--- a/include/gutenprint/path.h
+++ b/include/gutenprint/path.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: path.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: path.h,v 1.2 2008/06/01 14:41:03 rlk Exp $"
  *
  *   libgimpprint path functions header
  *
@@ -46,6 +46,12 @@ extern stp_list_t *stp_path_search(stp_list_t *dirlist,
 extern void stp_path_split(stp_list_t *list,
 			   const char *path);
 
+extern stp_list_t *stpi_data_path(void);
+
+extern stp_list_t *stpi_list_files_on_data_path(const char *name);
+
+extern char *stpi_path_merge(const char *path, const char *file);
+
 
 #ifdef __cplusplus
   }
@@ -53,5 +59,5 @@ extern void stp_path_split(stp_list_t *list,
 
 #endif /* GUTENPRINT_PATH_H */
 /*
- * End of "$Id: path.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $".
+ * End of "$Id: path.h,v 1.2 2008/06/01 14:41:03 rlk Exp $".
  */
diff --git a/include/gutenprint/printers.h b/include/gutenprint/printers.h
index 6b99642..86a9462 100644
--- a/include/gutenprint/printers.h
+++ b/include/gutenprint/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h,v 1.4 2007/08/27 00:44:12 rlk Exp $"
+ * "$Id: printers.h,v 1.5 2008/06/03 11:40:39 rlk Exp $"
  *
  *   libgimpprint printer functions.
  *
@@ -148,13 +148,21 @@ extern int stp_printer_get_model(const stp_printer_t *p);
 extern const stp_vars_t *stp_printer_get_defaults(const stp_printer_t *p);
 
 /**
- * Set a vars object to use a particular driver, and set the parameter
- * to its defaults.
+ * Set a vars object to use a particular driver, and set the parameters
+ * to their defaults.
  * @param v the vars to use.
  * @param p the printer model to use.
  */
 extern void stp_set_printer_defaults(stp_vars_t *v, const stp_printer_t *p);
 
+/**
+ * Set a vars object to use a particular driver, and set any unset parameters
+ * to their defaults.
+ * @param v the vars to use.
+ * @param p the printer model to use.
+ */
+extern void stp_set_printer_defaults_soft(stp_vars_t *v, const stp_printer_t *p);
+
 
 /**
  * Print the image.
@@ -247,5 +255,5 @@ const char *stp_describe_output(const stp_vars_t *v);
 
 #endif /* GUTENPRINT_PRINTERS_H */
 /*
- * End of "$Id: printers.h,v 1.4 2007/08/27 00:44:12 rlk Exp $".
+ * End of "$Id: printers.h,v 1.5 2008/06/03 11:40:39 rlk Exp $".
  */
diff --git a/include/gutenprint/util.h b/include/gutenprint/util.h
index 1174d59..db322f1 100644
--- a/include/gutenprint/util.h
+++ b/include/gutenprint/util.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.h,v 1.6 2007/09/09 21:13:55 rlk Exp $"
+ * "$Id: util.h,v 1.7 2008/07/13 18:05:10 rlk Exp $"
  *
  *   libgimpprint utility and miscellaneous functions.
  *
@@ -129,6 +129,7 @@ extern void stp_catprintf(char **strp, const char *format, ...)
 #define STP_DBG_CURVE		0x80000
 #define STP_DBG_CURVE_ERRORS	0x100000
 #define STP_DBG_PPD		0x200000
+#define STP_DBG_NO_COMPRESSION	0x400000
 
 extern unsigned long stp_get_debug_level(void);
 extern void stp_dprintf(unsigned long level, const stp_vars_t *v,
@@ -179,5 +180,5 @@ extern const char *stp_get_release_version(void);
 
 #endif /* GUTENPRINT_UTIL_H */
 /*
- * End of "$Id: util.h,v 1.6 2007/09/09 21:13:55 rlk Exp $".
+ * End of "$Id: util.h,v 1.7 2008/07/13 18:05:10 rlk Exp $".
  */
diff --git a/include/gutenprint/vars.h b/include/gutenprint/vars.h
index 774876a..ae93656 100644
--- a/include/gutenprint/vars.h
+++ b/include/gutenprint/vars.h
@@ -146,6 +146,8 @@ typedef struct
   int upper; /*!< Upper bound. */
 } stp_int_bound_t;
 
+#define STP_CHANNEL_NONE ((unsigned char) -1)
+
 /** Parameter description. */
 typedef struct
 {
@@ -962,13 +964,95 @@ extern void stp_clear_array_parameter(stp_vars_t *v, const char *parameter);
 extern void stp_clear_raw_parameter(stp_vars_t *v, const char *parameter);
 
 /**
+ * Clear a parameter.
+ * @param v the vars to use.
+ * @param parameter the name of the parameter.
+ * @param type the type of the parameter.
+ */
+extern void stp_clear_parameter(stp_vars_t *v, const char *parameter, stp_parameter_type_t type);
+
+
+/**
+ * List all string parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_string_parameters(const stp_vars_t *v);
+
+/**
+ * List all file parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_file_parameters(const stp_vars_t *v);
+
+/**
+ * List all float parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_float_parameters(const stp_vars_t *v);
+
+/**
+ * List all integer parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_int_parameters(const stp_vars_t *v);
+
+/**
+ * List all dimension parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_dimension_parameters(const stp_vars_t *v);
+
+/**
+ * List all boolean parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_boolean_parameters(const stp_vars_t *v);
+
+/**
+ * List all curve parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_curve_parameters(const stp_vars_t *v);
+
+/**
+ * List all array parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_array_parameters(const stp_vars_t *v);
+
+/**
+ * List all raw parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_raw_parameters(const stp_vars_t *v);
+
+/**
+ * List all parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ * @param type the type of the parameter.
+ */
+extern stp_string_list_t *stp_list_parameters(const stp_vars_t *v,
+					      stp_parameter_type_t type);
+
+
+/**
  * Set the activity of a string parameter.
  * @param v the vars to use.
  * @param parameter the name of the parameter.
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_string_parameter_active(const stp_vars_t *v,
+extern void stp_set_string_parameter_active(stp_vars_t *v,
 					    const char *parameter,
 					    stp_parameter_activity_t active);
 
@@ -979,7 +1063,7 @@ extern void stp_set_string_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_file_parameter_active(const stp_vars_t *v,
+extern void stp_set_file_parameter_active(stp_vars_t *v,
 					  const char *parameter,
 					  stp_parameter_activity_t active);
 
@@ -990,7 +1074,7 @@ extern void stp_set_file_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_float_parameter_active(const stp_vars_t *v,
+extern void stp_set_float_parameter_active(stp_vars_t *v,
 					 const char *parameter,
 					 stp_parameter_activity_t active);
 
@@ -1001,7 +1085,7 @@ extern void stp_set_float_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_int_parameter_active(const stp_vars_t *v,
+extern void stp_set_int_parameter_active(stp_vars_t *v,
 					 const char *parameter,
 					 stp_parameter_activity_t active);
 
@@ -1012,7 +1096,7 @@ extern void stp_set_int_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_dimension_parameter_active(const stp_vars_t *v,
+extern void stp_set_dimension_parameter_active(stp_vars_t *v,
 					       const char *parameter,
 					       stp_parameter_activity_t active);
 
@@ -1023,7 +1107,7 @@ extern void stp_set_dimension_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_boolean_parameter_active(const stp_vars_t *v,
+extern void stp_set_boolean_parameter_active(stp_vars_t *v,
 					     const char *parameter,
 					     stp_parameter_activity_t active);
 
@@ -1034,7 +1118,7 @@ extern void stp_set_boolean_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_curve_parameter_active(const stp_vars_t *v,
+extern void stp_set_curve_parameter_active(stp_vars_t *v,
 					   const char *parameter,
 					   stp_parameter_activity_t active);
 
@@ -1045,7 +1129,7 @@ extern void stp_set_curve_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_array_parameter_active(const stp_vars_t *v,
+extern void stp_set_array_parameter_active(stp_vars_t *v,
 					   const char *parameter,
 					   stp_parameter_activity_t active);
 
@@ -1056,11 +1140,24 @@ extern void stp_set_array_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_raw_parameter_active(const stp_vars_t *v,
+extern void stp_set_raw_parameter_active(stp_vars_t *v,
 					 const char *parameter,
 					 stp_parameter_activity_t active);
 
 /**
+ * Set the activity of a parameter.
+ * @param v the vars to use.
+ * @param parameter the name of the parameter.
+ * @param active the activity status to set (should be set to
+ * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
+ * @param type the type of the parameter.
+ */
+extern void stp_set_parameter_active(stp_vars_t *v,
+				     const char *parameter,
+				     stp_parameter_activity_t active,
+				     stp_parameter_type_t type);
+
+/**
  * Check if a string parameter is set.
  * @param v the vars to use.
  * @param parameter the name of the parameter.
@@ -1142,6 +1239,17 @@ extern int stp_check_raw_parameter(const stp_vars_t *v, const char *parameter,
 				   stp_parameter_activity_t active);
 
 /**
+ * Check if a parameter is set.
+ * @param v the vars to use.
+ * @param parameter the name of the parameter.
+ * @param active the minimum activity status.
+ * @param type the type of the parameter.
+ */
+extern int stp_check_parameter(const stp_vars_t *v, const char *parameter,
+			       stp_parameter_activity_t active,
+			       stp_parameter_type_t type);
+
+/**
  * Get the activity status of a string parameter.
  * @param v the vars to use.
  * @param parameter the name of the parameter.
@@ -1222,6 +1330,16 @@ stp_get_array_parameter_active(const stp_vars_t *v, const char *parameter);
 extern stp_parameter_activity_t
 stp_get_raw_parameter_active(const stp_vars_t *v, const char *parameter);
 
+/**
+ * Get the activity status of a parameter.
+ * @param v the vars to use.
+ * @param parameter the name of the parameter.
+ * @param type the type of the parameter.
+ */
+extern stp_parameter_activity_t
+stp_get_parameter_active(const stp_vars_t *v, const char *parameter,
+			 stp_parameter_type_t type);
+
 
 
 /****************************************************************
@@ -1383,5 +1501,5 @@ stp_fill_parameter_settings(stp_parameter_t *desc,
 
 #endif /* GUTENPRINT_VARS_H */
 /*
- * End of "$Id: vars.h,v 1.4 2007/01/23 01:18:16 rlk Exp $".
+ * End of "$Id: vars.h,v 1.7 2008/07/04 14:29:27 rlk Exp $".
  */
diff --git a/include/gutenprint/xml.h b/include/gutenprint/xml.h
index 5f88686..4b3f424 100644
--- a/include/gutenprint/xml.h
+++ b/include/gutenprint/xml.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: xml.h,v 1.2 2006/08/07 09:52:41 rleigh Exp $"
+ * "$Id: xml.h,v 1.4 2008/07/06 02:17:42 rlk Exp $"
  *
  *   Gutenprint module loader header
  *
@@ -53,6 +53,10 @@ extern int stp_xml_parse_file(const char *file);
 extern long stp_xmlstrtol(const char *value);
 extern unsigned long stp_xmlstrtoul(const char *value);
 extern double stp_xmlstrtod(const char *textval);
+extern stp_raw_t *stp_xmlstrtoraw(const char *textval);
+extern char *stp_rawtoxmlstr(const stp_raw_t *raw);
+extern char *stp_strtoxmlstr(const char *raw);
+extern void stp_prtraw(const stp_raw_t *raw, FILE *fp);
 
 extern void stp_xml_init(void);
 extern void stp_xml_exit(void);
@@ -67,7 +71,16 @@ extern stp_curve_t *stp_curve_create_from_xmltree(stp_mxml_node_t *da);
 extern stp_mxml_node_t *stp_xmltree_create_from_curve(const stp_curve_t *curve);
 
 extern stp_array_t *stp_array_create_from_xmltree(stp_mxml_node_t *array);
+extern stp_vars_t *stp_vars_create_from_xmltree(stp_mxml_node_t *da);
 extern stp_mxml_node_t *stp_xmltree_create_from_array(const stp_array_t *array);
+extern stp_vars_t *stp_vars_create_from_xmltree_ref(stp_mxml_node_t *da,
+						    stp_mxml_node_t *root);
+extern void stp_vars_fill_from_xmltree(stp_mxml_node_t *da, stp_vars_t *v);
+extern void stp_vars_fill_from_xmltree_ref(stp_mxml_node_t *da,
+					   stp_mxml_node_t *root,
+					   stp_vars_t *v);
+extern stp_mxml_node_t *stp_xmltree_create_from_vars(const stp_vars_t *v);
+
 extern void stp_xml_parse_file_named(const char *name);
 
 #ifdef __cplusplus
@@ -76,5 +89,5 @@ extern void stp_xml_parse_file_named(const char *name);
 
 #endif /* GUTENPRINT_XML_H */
 /*
- * End of "$Id: xml.h,v 1.2 2006/08/07 09:52:41 rleigh Exp $".
+ * End of "$Id: xml.h,v 1.4 2008/07/06 02:17:42 rlk Exp $".
  */
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index b9626db..868ba48 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -43,7 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.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
@@ -100,6 +101,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -120,6 +122,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -152,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -172,9 +176,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -201,6 +206,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -345,8 +351,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -358,8 +364,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -369,13 +375,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique