New upstream version 5.3.0~pre1

1 files changed, 207 insertions, 143 deletions

diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag
index c33615b..24daa33 100644
--- a/doc/gutenprint/gutenprint.tag
+++ b/doc/gutenprint/gutenprint.tag
@@ -2,7 +2,7 @@
 <tagfile>
   <compound kind="file">
     <name>array.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>array_8h</filename>
     <includes id="sequence_8h" name="sequence.h" local="no" imported="no">gutenprint/sequence.h</includes>
     <member kind="typedef">
@@ -92,7 +92,7 @@
   </compound>
   <compound kind="file">
     <name>bit-ops.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>bit-ops_8h</filename>
     <member kind="function">
       <type>void</type>
@@ -188,7 +188,7 @@
   </compound>
   <compound kind="file">
     <name>channel.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>channel_8h</filename>
     <member kind="function">
       <type>void</type>
@@ -361,7 +361,7 @@
   </compound>
   <compound kind="file">
     <name>color.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>color_8h</filename>
     <class kind="struct">stp_colorfuncs_t</class>
     <class kind="struct">stp_color</class>
@@ -459,7 +459,7 @@
   </compound>
   <compound kind="file">
     <name>curve-cache.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>curve-cache_8h</filename>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
     <class kind="struct">stp_cached_curve_t</class>
@@ -557,7 +557,7 @@
   </compound>
   <compound kind="file">
     <name>curve.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>curve_8h</filename>
     <includes id="sequence_8h" name="sequence.h" local="no" imported="no">gutenprint/sequence.h</includes>
     <class kind="struct">stp_curve_point_t</class>
@@ -995,7 +995,7 @@
   </compound>
   <compound kind="file">
     <name>dither.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>dither_8h</filename>
     <class kind="struct">stp_dither_matrix_short</class>
     <class kind="struct">stp_dither_matrix_normal</class>
@@ -1300,7 +1300,7 @@
   </compound>
   <compound kind="file">
     <name>gutenprint-intl-internal.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>gutenprint-intl-internal_8h</filename>
     <member kind="define">
       <type>#define</type>
@@ -1354,7 +1354,7 @@
   </compound>
   <compound kind="file">
     <name>gutenprint-intl.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>gutenprint-intl_8h</filename>
     <member kind="define">
       <type>#define</type>
@@ -1408,7 +1408,7 @@
   </compound>
   <compound kind="file">
     <name>gutenprint-module.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>gutenprint-module_8h</filename>
     <includes id="gutenprint_8h" name="gutenprint.h" local="no" imported="no">gutenprint/gutenprint.h</includes>
     <includes id="bit-ops_8h" name="bit-ops.h" local="no" imported="no">gutenprint/bit-ops.h</includes>
@@ -1430,7 +1430,7 @@
   </compound>
   <compound kind="file">
     <name>gutenprint-version.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>gutenprint-version_8h</filename>
     <member kind="define">
       <type>#define</type>
@@ -1533,7 +1533,7 @@
   </compound>
   <compound kind="file">
     <name>gutenprint.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>gutenprint_8h</filename>
     <includes id="array_8h" name="array.h" local="no" imported="no">gutenprint/array.h</includes>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
@@ -1548,8 +1548,9 @@
   </compound>
   <compound kind="file">
     <name>image.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>image_8h</filename>
+    <includes id="types_8h" name="types.h" local="no" imported="no">gutenprint/types.h</includes>
     <class kind="struct">stp_image</class>
     <member kind="define">
       <type>#define</type>
@@ -1636,7 +1637,7 @@
   </compound>
   <compound kind="file">
     <name>list.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>list_8h</filename>
     <member kind="typedef">
       <type>struct stp_list_item</type>
@@ -1865,7 +1866,7 @@
   </compound>
   <compound kind="file">
     <name>module.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>module_8h</filename>
     <includes id="list_8h" name="list.h" local="no" imported="no">gutenprint/list.h</includes>
     <class kind="struct">stp_module_version</class>
@@ -1966,8 +1967,9 @@
   </compound>
   <compound kind="file">
     <name>mxml.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>mxml_8h</filename>
+    <includes id="types_8h" name="types.h" local="no" imported="no">gutenprint/types.h</includes>
     <class kind="struct">stp_mxml_attr_s</class>
     <class kind="struct">stp_mxml_value_s</class>
     <class kind="struct">stp_mxml_text_s</class>
@@ -2150,6 +2152,12 @@
       <anchor>af8b58610b5fb382d0f075cb3bcf3b6baaccc874638f0a0d375e1066d8c82c8be9</anchor>
       <arglist></arglist>
     </member>
+    <member kind="enumvalue">
+      <name>STP_MXML_DIMENSION</name>
+      <anchorfile>mxml_8h.html</anchorfile>
+      <anchor>af8b58610b5fb382d0f075cb3bcf3b6baa587b6fa39b7396c3a0d05522716eeb65</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="function">
       <type>void</type>
       <name>stp_mxmlAdd</name>
@@ -2236,6 +2244,13 @@
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
+      <name>stp_mxmlNewDimension</name>
+      <anchorfile>mxml_8h.html</anchorfile>
+      <anchor>aa05fdf7cb3b5ad98a0afc4a480d71d6f</anchor>
+      <arglist>(stp_mxml_node_t *parent, stp_dimension_t real)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewText</name>
       <anchorfile>mxml_8h.html</anchorfile>
       <anchor>a05bd9944cadbef034730a53ca47c9f6a</anchor>
@@ -2293,8 +2308,9 @@
   </compound>
   <compound kind="file">
     <name>paper.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>paper_8h</filename>
+    <includes id="types_8h" name="types.h" local="no" imported="no">gutenprint/types.h</includes>
     <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes>
     <class kind="struct">stp_papersize_t</class>
     <member kind="enumeration">
@@ -2371,15 +2387,15 @@
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga1484a5e75a2b2921bbe0c9e17deb0b77</anchor>
-      <arglist>(int length, int width)</arglist>
+      <anchor>ga0b6ed5fa9f761c85d7992d33af5dcdce</anchor>
+      <arglist>(stp_dimension_t length, stp_dimension_t width)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_size_exact</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga879cd515ca2eb5fd8cd76ae62f4bfa4e</anchor>
-      <arglist>(int length, int width)</arglist>
+      <anchor>gaa80ec891bdc954c6ee3db8f703f83d71</anchor>
+      <arglist>(stp_dimension_t length, stp_dimension_t width)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
@@ -2392,13 +2408,13 @@
       <type>void</type>
       <name>stp_default_media_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga33c0be56646361b1ce85a9d338336dd3</anchor>
-      <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
+      <anchor>gaa6e3d956dcc13c8aa2e489164aacf442</anchor>
+      <arglist>(const stp_vars_t *v, stp_dimension_t *width, stp_dimension_t *height)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>path.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>path_8h</filename>
     <member kind="function">
       <type>stp_list_t *</type>
@@ -2438,8 +2454,9 @@
   </compound>
   <compound kind="file">
     <name>printers.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>printers_8h</filename>
+    <includes id="types_8h" name="types.h" local="no" imported="no">gutenprint/types.h</includes>
     <includes id="string-list_8h" name="string-list.h" local="no" imported="no">gutenprint/string-list.h</includes>
     <includes id="list_8h" name="list.h" local="no" imported="no">gutenprint/list.h</includes>
     <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes>
@@ -2679,7 +2696,7 @@
   </compound>
   <compound kind="file">
     <name>sequence.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>sequence_8h</filename>
     <member kind="typedef">
       <type>struct stp_sequence</type>
@@ -2901,7 +2918,7 @@
   </compound>
   <compound kind="file">
     <name>string-list.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>string-list_8h</filename>
     <class kind="struct">stp_param_string_t</class>
     <member kind="typedef">
@@ -2990,8 +3007,27 @@
     </member>
   </compound>
   <compound kind="file">
+    <name>types.h</name>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
+    <filename>types_8h</filename>
+    <member kind="typedef">
+      <type>double</type>
+      <name>stp_dimension_t</name>
+      <anchorfile>types_8h.html</anchorfile>
+      <anchor>a28331211ca816787023d0444a79585ac</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
+      <type>int</type>
+      <name>stp_resolution_t</name>
+      <anchorfile>types_8h.html</anchorfile>
+      <anchor>a8c45677b01aee135a134e452cf6c4d9b</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="file">
     <name>util.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>util_8h</filename>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
     <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes>
@@ -3432,14 +3468,16 @@
   </compound>
   <compound kind="file">
     <name>vars.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>vars_8h</filename>
+    <includes id="types_8h" name="types.h" local="no" imported="no">gutenprint/types.h</includes>
     <includes id="array_8h" name="array.h" local="no" imported="no">gutenprint/array.h</includes>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
     <includes id="string-list_8h" name="string-list.h" local="no" imported="no">gutenprint/string-list.h</includes>
     <class kind="struct">stp_raw_t</class>
     <class kind="struct">stp_double_bound_t</class>
     <class kind="struct">stp_int_bound_t</class>
+    <class kind="struct">stp_dimension_bound_t</class>
     <class kind="struct">stp_parameter_t</class>
     <member kind="define">
       <type>#define</type>
@@ -3794,84 +3832,84 @@
       <type>void</type>
       <name>stp_set_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga3b0cc83e87247854ecafd46a6e446bcb</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>ga43723e71ac3d128cb60f3a8647da2bda</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga5c02ee2422d86e4bcdcae613c70c9e1e</anchor>
+      <anchor>ga552aff414bcb0d0e47bcecbbae151200</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga557b5ad44d3b1da8392496681624ad8b</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>ga0097b9757c0145621bd734404e165310</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga292132b97b20a6d034e22f4146d36131</anchor>
+      <anchor>ga78161d3b7f6da93d4ca69a43c72a6026</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga3a852ce7e42d7f8e0cef6c7d399e0491</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>ga7d9fe91d4061a278fb81407c108051c2</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga1c54d99b94c69a67eb4ae0349a4720e7</anchor>
+      <anchor>ga5ea05bffa12b1b9ab4d00967b4b15985</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga8ce73c5efa41f005936d5f84c44c6667</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>ga33dbc18695131be971381f3193e3d6e3</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga8731a92f5d3047e00ba33577821d5aec</anchor>
+      <anchor>gaa8bdf68b63b9803f0beabd8575c16e9c</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga639be0da07c3e5b7dc6d68ac2aa999e9</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>gad3c936e04f59788bddd4d35152d31b75</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gaad2d305eed993707d22263b54578a39b</anchor>
+      <anchor>ga23866dae33987db3dc68c664d4efcb1d</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga83326bacb8b92149af1b70457b23bc8f</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>gab3700a20712230a9a79046d81dcc758d</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gac0c4928fa488bb95e73ba9b8aa932584</anchor>
+      <anchor>gaa3173c007ecc0d426e46dfd3c13075cf</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
@@ -4074,8 +4112,8 @@
       <type>void</type>
       <name>stp_set_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga6ca7898c212230cdbdc70ada2efb1417</anchor>
-      <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
+      <anchor>gae08f8a1ee0fc7dfc47bdfe13c9fd2c5a</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_dimension_t value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
@@ -4158,8 +4196,8 @@
       <type>void</type>
       <name>stp_set_default_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gab6f1820cadd75a4311bfc49b01de447b</anchor>
-      <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
+      <anchor>ga472f76e75c57ab5c88e8055f467b8e50</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_dimension_t value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
@@ -4218,10 +4256,10 @@
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga3c8d1333086ca5a01a3439f94d9f94d3</anchor>
+      <anchor>gaf093cba0d9ae5b8ad88d6f4bc55522f2</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
@@ -4606,36 +4644,36 @@
       <type>void</type>
       <name>stp_get_media_size</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gac9e6d740ffc4cff5dc7d0bf106a3e7df</anchor>
-      <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
+      <anchor>gaec582fdf4df9806b1a403d9bda45db71</anchor>
+      <arglist>(const stp_vars_t *v, stp_dimension_t *width, stp_dimension_t *height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga67d1e68ed47e5b554f2021fca1f01978</anchor>
-      <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+      <anchor>ga39789de068575617708d8178875cd707</anchor>
+      <arglist>(const stp_vars_t *v, stp_dimension_t *left, stp_dimension_t *right, stp_dimension_t *bottom, stp_dimension_t *top)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_maximum_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gad17cadb7fd78bffb759f2213a1a90df6</anchor>
-      <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+      <anchor>gaacd796aa1bc61acc395f9409d912df06</anchor>
+      <arglist>(const stp_vars_t *v, stp_dimension_t *left, stp_dimension_t *right, stp_dimension_t *bottom, stp_dimension_t *top)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_size_limit</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga0c8ee62453baff3d2c00e0ccae67b049</anchor>
-      <arglist>(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
+      <anchor>gae0e7959db2151f1c705ee3962e9f5d9e</anchor>
+      <arglist>(const stp_vars_t *v, stp_dimension_t *max_width, stp_dimension_t *max_height, stp_dimension_t *min_width, stp_dimension_t *min_height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_resolution</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga88715b31fcec18778f769ffbc1b55384</anchor>
-      <arglist>(const stp_vars_t *v, int *x, int *y)</arglist>
+      <anchor>gac6b8f6ed18e86ced80c2394867514d94</anchor>
+      <arglist>(const stp_vars_t *v, stp_resolution_t *x, stp_resolution_t *y)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
@@ -4731,7 +4769,7 @@
   </compound>
   <compound kind="file">
     <name>weave.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>weave_8h</filename>
     <class kind="struct">stp_weave_t</class>
     <class kind="struct">stp_pass_t</class>
@@ -4926,7 +4964,7 @@
   </compound>
   <compound kind="file">
     <name>xml.h</name>
-    <path>/home/rlk/sandbox/gutenprint-5.2/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/gimp-print-source/include/gutenprint/</path>
     <filename>xml_8h</filename>
     <includes id="mxml_8h" name="mxml.h" local="no" imported="no">gutenprint/mxml.h</includes>
     <member kind="typedef">
@@ -5000,6 +5038,13 @@
       <arglist>(const char *textval)</arglist>
     </member>
     <member kind="function">
+      <type>stp_dimension_t</type>
+      <name>stp_xmlstrtodim</name>
+      <anchorfile>xml_8h.html</anchorfile>
+      <anchor>ac54058829dfbc72b3c5d5a5885f2f55c</anchor>
+      <arglist>(const char *textval)</arglist>
+    </member>
+    <member kind="function">
       <type>stp_raw_t *</type>
       <name>stp_xmlstrtoraw</name>
       <anchorfile>xml_8h.html</anchorfile>
@@ -5364,6 +5409,24 @@
     </member>
   </compound>
   <compound kind="struct">
+    <name>stp_dimension_bound_t</name>
+    <filename>structstp__dimension__bound__t.html</filename>
+    <member kind="variable">
+      <type>stp_dimension_t</type>
+      <name>lower</name>
+      <anchorfile>structstp__dimension__bound__t.html</anchorfile>
+      <anchor>a56f141ca916da32f7da78947451e5718</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_dimension_t</type>
+      <name>upper</name>
+      <anchorfile>structstp__dimension__bound__t.html</anchorfile>
+      <anchor>aaf9d591f6adef97e576eff93ed62e151</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
     <name>stp_dither_matrix_generic</name>
     <filename>structstp__dither__matrix__generic.html</filename>
     <member kind="variable">
@@ -5965,45 +6028,45 @@
       <arglist></arglist>
     </member>
     <member kind="variable">
-      <type>unsigned</type>
+      <type>stp_dimension_t</type>
       <name>width</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>aedcca3776ddeb5ed815df3aa112147dd</anchor>
+      <anchor>a8573bbe8f5e454ab7f2849e9bbe60263</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
-      <type>unsigned</type>
+      <type>stp_dimension_t</type>
       <name>height</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>a040d59e39abdef9b12c929734fb7a08c</anchor>
+      <anchor>a7b628cb91182af4b43280bdf99399bbd</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
-      <type>unsigned</type>
+      <type>stp_dimension_t</type>
       <name>top</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>a7fc8acdb1d905d6ca4a0b9b247a6c48e</anchor>
+      <anchor>ac34a88a073f89f1550a4d2fd8ae2d5e5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
-      <type>unsigned</type>
+      <type>stp_dimension_t</type>
       <name>left</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>a9ceb7ef01ea56c990eddbef4140b34a0</anchor>
+      <anchor>a8a3b8ed8eebf1833e892d80c1623d713</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
-      <type>unsigned</type>
+      <type>stp_dimension_t</type>
       <name>bottom</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>a9c7fcf4d0bac23817b6f56996fed4043</anchor>
+      <anchor>a8c27265091a8a83e63fc9548cd05f243</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
-      <type>unsigned</type>
+      <type>stp_dimension_t</type>
       <name>right</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>a6899599f2f940e95e03545ff71e2b4c5</anchor>
+      <anchor>ab60c8c27b1c83b55d42d9b573428462a</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
@@ -6148,10 +6211,10 @@
       <arglist></arglist>
     </member>
     <member kind="variable">
-      <type>stp_int_bound_t</type>
+      <type>stp_dimension_bound_t</type>
       <name>dimension</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>a29505a2b48cd755e10cedf01f3683d61</anchor>
+      <anchor>a5169a4eb2b5aa6ec49520f49e947ee96</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
@@ -6183,10 +6246,10 @@
       <arglist></arglist>
     </member>
     <member kind="variable">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>dimension</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>a5d8633772783bb1c66ffa66d7f720a9d</anchor>
+      <anchor>a603f013fcf8b9372ecf4c966bc8e3cb8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
@@ -6285,29 +6348,29 @@
       <type>void(*</type>
       <name>media_size</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>a2b9b78f7a2887084932cf7b396d0b3d3</anchor>
-      <arglist>)(const stp_vars_t *v, int *width, int *height)</arglist>
+      <anchor>a6c55dd4df52d4cd983c4b2849b2b4b7c</anchor>
+      <arglist>)(const stp_vars_t *v, stp_dimension_t *width, stp_dimension_t *height)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>imageable_area</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>a4f791449ab8b2e77797792fcaf40eeba</anchor>
-      <arglist>)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+      <anchor>af90287c2734a5199fa90d86fe05cdfba</anchor>
+      <arglist>)(const stp_vars_t *v, stp_dimension_t *left, stp_dimension_t *right, stp_dimension_t *bottom, stp_dimension_t *top)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>maximum_imageable_area</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>aa8b3762f64a7eaed0dd2d41bb5f10bb1</anchor>
-      <arglist>)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+      <anchor>a3c4a2326fb31d1c6d6c52040efb1cb4a</anchor>
+      <arglist>)(const stp_vars_t *v, stp_dimension_t *left, stp_dimension_t *right, stp_dimension_t *bottom, stp_dimension_t *top)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>limit</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>a55aff48ac6f943c37fae2c9c4649576a</anchor>
-      <arglist>)(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
+      <anchor>ad27def92b17dc89090017882729eb556</anchor>
+      <arglist>)(const stp_vars_t *v, stp_dimension_t *max_width, stp_dimension_t *max_height, stp_dimension_t *min_width, stp_dimension_t *min_height)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
@@ -6320,8 +6383,8 @@
       <type>void(*</type>
       <name>describe_resolution</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>a8bc0711182aa988a2d5c53ec97714da7</anchor>
-      <arglist>)(const stp_vars_t *v, int *x, int *y)</arglist>
+      <anchor>a77a24cbc2d0f3371aa6c96a8a8809995</anchor>
+      <arglist>)(const stp_vars_t *v, stp_resolution_t *x, stp_resolution_t *y)</arglist>
     </member>
     <member kind="variable">
       <type>const char *(*</type>
@@ -7686,15 +7749,15 @@
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga1484a5e75a2b2921bbe0c9e17deb0b77</anchor>
-      <arglist>(int length, int width)</arglist>
+      <anchor>ga0b6ed5fa9f761c85d7992d33af5dcdce</anchor>
+      <arglist>(stp_dimension_t length, stp_dimension_t width)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_size_exact</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga879cd515ca2eb5fd8cd76ae62f4bfa4e</anchor>
-      <arglist>(int length, int width)</arglist>
+      <anchor>gaa80ec891bdc954c6ee3db8f703f83d71</anchor>
+      <arglist>(stp_dimension_t length, stp_dimension_t width)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
@@ -7707,8 +7770,8 @@
       <type>void</type>
       <name>stp_default_media_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga33c0be56646361b1ce85a9d338336dd3</anchor>
-      <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
+      <anchor>gaa6e3d956dcc13c8aa2e489164aacf442</anchor>
+      <arglist>(const stp_vars_t *v, stp_dimension_t *width, stp_dimension_t *height)</arglist>
     </member>
   </compound>
   <compound kind="group">
@@ -8610,6 +8673,7 @@
     <class kind="struct">stp_raw_t</class>
     <class kind="struct">stp_double_bound_t</class>
     <class kind="struct">stp_int_bound_t</class>
+    <class kind="struct">stp_dimension_bound_t</class>
     <class kind="struct">stp_parameter_t</class>
     <member kind="define">
       <type>#define</type>
@@ -8964,84 +9028,84 @@
       <type>void</type>
       <name>stp_set_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga3b0cc83e87247854ecafd46a6e446bcb</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>ga43723e71ac3d128cb60f3a8647da2bda</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga5c02ee2422d86e4bcdcae613c70c9e1e</anchor>
+      <anchor>ga552aff414bcb0d0e47bcecbbae151200</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga557b5ad44d3b1da8392496681624ad8b</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>ga0097b9757c0145621bd734404e165310</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga292132b97b20a6d034e22f4146d36131</anchor>
+      <anchor>ga78161d3b7f6da93d4ca69a43c72a6026</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga3a852ce7e42d7f8e0cef6c7d399e0491</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>ga7d9fe91d4061a278fb81407c108051c2</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga1c54d99b94c69a67eb4ae0349a4720e7</anchor>
+      <anchor>ga5ea05bffa12b1b9ab4d00967b4b15985</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga8ce73c5efa41f005936d5f84c44c6667</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>ga33dbc18695131be971381f3193e3d6e3</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga8731a92f5d3047e00ba33577821d5aec</anchor>
+      <anchor>gaa8bdf68b63b9803f0beabd8575c16e9c</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga639be0da07c3e5b7dc6d68ac2aa999e9</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>gad3c936e04f59788bddd4d35152d31b75</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gaad2d305eed993707d22263b54578a39b</anchor>
+      <anchor>ga23866dae33987db3dc68c664d4efcb1d</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga83326bacb8b92149af1b70457b23bc8f</anchor>
-      <arglist>(stp_vars_t *v, int val)</arglist>
+      <anchor>gab3700a20712230a9a79046d81dcc758d</anchor>
+      <arglist>(stp_vars_t *v, stp_dimension_t val)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gac0c4928fa488bb95e73ba9b8aa932584</anchor>
+      <anchor>gaa3173c007ecc0d426e46dfd3c13075cf</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
@@ -9244,8 +9308,8 @@
       <type>void</type>
       <name>stp_set_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga6ca7898c212230cdbdc70ada2efb1417</anchor>
-      <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
+      <anchor>gae08f8a1ee0fc7dfc47bdfe13c9fd2c5a</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_dimension_t value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
@@ -9328,8 +9392,8 @@
       <type>void</type>
       <name>stp_set_default_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gab6f1820cadd75a4311bfc49b01de447b</anchor>
-      <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
+      <anchor>ga472f76e75c57ab5c88e8055f467b8e50</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_dimension_t value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
@@ -9388,10 +9452,10 @@
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
-      <type>int</type>
+      <type>stp_dimension_t</type>
       <name>stp_get_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga3c8d1333086ca5a01a3439f94d9f94d3</anchor>
+      <anchor>gaf093cba0d9ae5b8ad88d6f4bc55522f2</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
@@ -9776,36 +9840,36 @@
       <type>void</type>
       <name>stp_get_media_size</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gac9e6d740ffc4cff5dc7d0bf106a3e7df</anchor>
-      <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
+      <anchor>gaec582fdf4df9806b1a403d9bda45db71</anchor>
+      <arglist>(const stp_vars_t *v, stp_dimension_t *width, stp_dimension_t *height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga67d1e68ed47e5b554f2021fca1f01978</anchor>
-      <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+      <anchor>ga39789de068575617708d8178875cd707</anchor>
+      <arglist>(const stp_vars_t *v, stp_dimension_t *left, stp_dimension_t *right, stp_dimension_t *bottom, stp_dimension_t *top)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_maximum_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gad17cadb7fd78bffb759f2213a1a90df6</anchor>
-      <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+      <anchor>gaacd796aa1bc61acc395f9409d912df06</anchor>
+      <arglist>(const stp_vars_t *v, stp_dimension_t *left, stp_dimension_t *right, stp_dimension_t *bottom, stp_dimension_t *top)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_size_limit</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga0c8ee62453baff3d2c00e0ccae67b049</anchor>
-      <arglist>(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
+      <anchor>gae0e7959db2151f1c705ee3962e9f5d9e</anchor>
+      <arglist>(const stp_vars_t *v, stp_dimension_t *max_width, stp_dimension_t *max_height, stp_dimension_t *min_width, stp_dimension_t *min_height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_resolution</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga88715b31fcec18778f769ffbc1b55384</anchor>
-      <arglist>(const stp_vars_t *v, int *x, int *y)</arglist>
+      <anchor>gac6b8f6ed18e86ced80c2394867514d94</anchor>
+      <arglist>(const stp_vars_t *v, stp_resolution_t *x, stp_resolution_t *y)</arglist>
     </member>
     <member kind="function">
       <type>int</type>