Imported Upstream version 4.3.99+cvs20060521

6 files changed, 48 insertions, 15 deletions

diff --git a/include/Makefile.in b/include/Makefile.in
index d502a69..bae3aba 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -15,6 +15,9 @@
 @SET_MAKE@
 
 # Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/main
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -250,6 +253,7 @@ USE_NLS = @USE_NLS@
 USE_NLS_FALSE = @USE_NLS_FALSE@
 USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
@@ -624,9 +628,6 @@ uninstall-info: uninstall-info-recursive
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index 339a3e6..4e45fe9 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/main
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -258,6 +261,7 @@ USE_NLS = @USE_NLS@
 USE_NLS_FALSE = @USE_NLS_FALSE@
 USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
@@ -601,9 +605,6 @@ uninstall-am: uninstall-info-am uninstall-nodist_pkgincludeHEADERS \
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/include/gutenprint/printers.h b/include/gutenprint/printers.h
index 103da04..18019e9 100644
--- a/include/gutenprint/printers.h
+++ b/include/gutenprint/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h,v 1.2 2004/11/28 15:59:29 rleigh Exp $"
+ * "$Id: printers.h,v 1.3 2006/04/17 02:06:18 rlk Exp $"
  *
  *   libgimpprint printer functions.
  *
@@ -192,6 +192,8 @@ typedef struct
   void  (*media_size)(const stp_vars_t *v, int *width, int *height);
   void  (*imageable_area)(const stp_vars_t *v,
 			  int *left, int *right, int *bottom, int *top);
+  void  (*maximum_imageable_area)(const stp_vars_t *v, int *left, int *right,
+				  int *bottom, int *top);
   void  (*limit)(const stp_vars_t *v, int *max_width, int *max_height,
                  int *min_width, int *min_height);
   int   (*print)(const stp_vars_t *v, stp_image_t *image);
@@ -232,5 +234,5 @@ const char *stp_describe_output(const stp_vars_t *v);
 
 #endif /* GUTENPRINT_PRINTERS_H */
 /*
- * End of "$Id: printers.h,v 1.2 2004/11/28 15:59:29 rleigh Exp $".
+ * End of "$Id: printers.h,v 1.3 2006/04/17 02:06:18 rlk Exp $".
  */
diff --git a/include/gutenprint/vars.h b/include/gutenprint/vars.h
index 57f9ae7..aacdbc1 100644
--- a/include/gutenprint/vars.h
+++ b/include/gutenprint/vars.h
@@ -1268,6 +1268,33 @@ extern void stp_get_imageable_area(const stp_vars_t *v, int *left, int *right,
 				   int *bottom, int *top);
 
 /**
+ * Get the maximum imagable area of the page.
+ * Retrieve the maximum (regardless of settings other than page sise)
+ * boundaries of the printable area of the page.  In combination
+ * with the media size, this can be used to determine the actual printable
+ * region, which callers can use to place the image precisely.  The
+ * dimensions are relative to the top left of the physical page.
+ *
+ * If a customizable page size is used (see stp_printer_get_media_size),
+ * the actual desired width and/or height must be filled in using
+ * stp_set_page_width and/or stp_set_page_height.  If these are not filled
+ * in, the margins will be returned.
+ *
+ * Returned values may be negative if a printer is capable of full bleed
+ * by printing beyond the physical boundaries of the page.
+ *
+ * If the media size stored in V is invalid, the return values
+ * will be indeterminate.  It is up to the user to specify legal values.
+ * @param v the vars to use.
+ * @param left a pointer to a int to store the left edge in.
+ * @param right a pointer to a int to store the right edge in.
+ * @param bottom a pointer to a int to store the bottom edge in.
+ * @param top a pointer to a int to store the top edge in.
+ */
+extern void stp_get_maximum_imageable_area(const stp_vars_t *v, int *left,
+					   int *right, int *bottom, int *top);
+
+/**
  * Get the media size limits.
  * Retrieve the minimum and maximum size limits for custom media sizes
  * with the current printer settings.
@@ -1353,5 +1380,5 @@ stp_fill_parameter_settings(stp_parameter_t *desc,
 
 #endif /* GUTENPRINT_VARS_H */
 /*
- * End of "$Id: vars.h,v 1.2 2005/04/09 13:59:17 rlk Exp $".
+ * End of "$Id: vars.h,v 1.3 2006/04/17 02:06:18 rlk Exp $".
  */
diff --git a/include/gutenprintui/Makefile.in b/include/gutenprintui/Makefile.in
index c8d50be..5cf92af 100644
--- a/include/gutenprintui/Makefile.in
+++ b/include/gutenprintui/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/main
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -254,6 +257,7 @@ USE_NLS = @USE_NLS@
 USE_NLS_FALSE = @USE_NLS_FALSE@
 USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
@@ -547,9 +551,6 @@ uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la:
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index 2598115..5eea924 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -16,6 +16,9 @@
 
 # Variables
 
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/main
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -255,6 +258,7 @@ USE_NLS = @USE_NLS@
 USE_NLS_FALSE = @USE_NLS_FALSE@
 USE_NLS_TRUE = @USE_NLS_TRUE@
 VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
@@ -558,9 +562,6 @@ uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
 
 @SET_MAKE@
 
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
 # Rules
 
 $(top_builddir)/src/main/libgutenprint.la: