From 7e12d32a372b5661f80b68009730cf47a6bfd062 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Sun, 26 Oct 2008 16:11:56 +0000 Subject: Imported Upstream version 4.3.99+cvs20050715 --- ChangeLog | 497 +++----- Makefile.in | 1 - NEWS | 783 +++++------- README | 203 ++- aclocal.m4 | 265 ++-- configure | 912 +++++++------- configure.ac | 8 +- doc/Makefile.in | 1 - doc/developer/Makefile.in | 1 - doc/developer/gutenprint.pdf | Bin 426243 -> 432725 bytes doc/developer/reference-html/HTML.manifest | 18 + doc/developer/reference-html/a2122.html | 220 ---- doc/developer/reference-html/book1.html | 453 +++++++ doc/developer/reference-html/c1717.html | 52 +- doc/developer/reference-html/c194.html | 17 +- doc/developer/reference-html/c1968.html | 99 +- doc/developer/reference-html/c200.html | 156 ++- doc/developer/reference-html/c39.html | 19 +- doc/developer/reference-html/c464.html | 791 ++++++------ doc/developer/reference-html/c48.html | 61 +- doc/developer/reference-html/docbook.css | 12 + doc/developer/reference-html/f14.html | 27 +- doc/developer/reference-html/gpl-terms.html | 588 +++++++++ doc/developer/reference-html/gpl.html | 236 ++++ doc/developer/reference-html/index.html | 481 ------- doc/developer/reference-html/ln10.html | 97 ++ .../reference-html/stylesheet-images/caution.gif | Bin 0 -> 1039 bytes .../reference-html/stylesheet-images/home.gif | Bin 0 -> 995 bytes .../reference-html/stylesheet-images/important.gif | Bin 0 -> 1081 bytes .../reference-html/stylesheet-images/next.gif | Bin 0 -> 964 bytes .../reference-html/stylesheet-images/note.gif | Bin 0 -> 1070 bytes .../reference-html/stylesheet-images/prev.gif | Bin 0 -> 944 bytes .../reference-html/stylesheet-images/tip.gif | Bin 0 -> 1029 bytes .../reference-html/stylesheet-images/toc-blank.gif | Bin 0 -> 95 bytes .../reference-html/stylesheet-images/toc-minus.gif | Bin 0 -> 843 bytes .../reference-html/stylesheet-images/toc-plus.gif | Bin 0 -> 846 bytes .../reference-html/stylesheet-images/up.gif | Bin 0 -> 922 bytes .../reference-html/stylesheet-images/warning.gif | Bin 0 -> 1052 bytes doc/developer/reference-html/x1669.html | 132 +- doc/developer/reference-html/x1734.html | 536 +++++++- doc/developer/reference-html/x2153.html | 616 --------- doc/developer/reference-html/x271.html | 178 +-- doc/developer/reference-html/x67.html | 32 +- doc/developer/reference-html/x79.html | 154 ++- doc/developer/reference-html/x955.html | 836 ++++++------ doc/gutenprint/gutenprint.tag | 125 +- doc/gutenprint/html/annotated.html | 6 +- doc/gutenprint/html/array_8h.html | 6 +- doc/gutenprint/html/bit-ops_8h.html | 20 +- doc/gutenprint/html/channel_8h.html | 127 +- doc/gutenprint/html/classes.html | 6 +- doc/gutenprint/html/color_8h.html | 6 +- doc/gutenprint/html/curve-cache_8h.html | 32 +- doc/gutenprint/html/curve_8h.html | 6 +- doc/gutenprint/html/deprecated.html | 6 +- doc/gutenprint/html/dir_000000.html | 6 +- doc/gutenprint/html/dir_000001.html | 6 +- doc/gutenprint/html/dirs.html | 6 +- doc/gutenprint/html/dither_8h.html | 90 +- doc/gutenprint/html/files.html | 6 +- doc/gutenprint/html/functions.html | 6 +- doc/gutenprint/html/functions_rela.html | 16 + doc/gutenprint/html/functions_vars.html | 6 +- doc/gutenprint/html/globals.html | 6 +- doc/gutenprint/html/globals_0x62.html | 6 +- doc/gutenprint/html/globals_0x63.html | 6 +- doc/gutenprint/html/globals_0x64.html | 6 +- doc/gutenprint/html/globals_0x67.html | 6 +- doc/gutenprint/html/globals_0x6e.html | 6 +- doc/gutenprint/html/globals_0x70.html | 6 +- doc/gutenprint/html/globals_0x73.html | 26 +- doc/gutenprint/html/globals_0x74.html | 6 +- doc/gutenprint/html/globals_defs.html | 6 +- doc/gutenprint/html/globals_enum.html | 6 +- doc/gutenprint/html/globals_eval.html | 6 +- doc/gutenprint/html/globals_func.html | 20 +- doc/gutenprint/html/globals_type.html | 6 +- doc/gutenprint/html/globals_vars.html | 6 +- doc/gutenprint/html/group__array.html | 30 +- doc/gutenprint/html/group__color.html | 32 +- doc/gutenprint/html/group__curve.html | 128 +- doc/gutenprint/html/group__image.html | 30 +- doc/gutenprint/html/group__intl.html | 20 +- doc/gutenprint/html/group__intl__internal.html | 20 +- doc/gutenprint/html/group__list.html | 70 +- doc/gutenprint/html/group__papersize.html | 26 +- doc/gutenprint/html/group__printer.html | 58 +- doc/gutenprint/html/group__sequence.html | 64 +- doc/gutenprint/html/group__util.html | 116 +- doc/gutenprint/html/group__vars.html | 338 ++--- doc/gutenprint/html/group__version.html | 34 +- .../html/gutenprint-intl-internal_8h.html | 6 +- doc/gutenprint/html/gutenprint-intl_8h.html | 6 +- doc/gutenprint/html/gutenprint-module_8h.html | 8 +- doc/gutenprint/html/gutenprint-version_8h.html | 29 +- doc/gutenprint/html/gutenprint_8h.html | 6 +- doc/gutenprint/html/image_8h.html | 6 +- doc/gutenprint/html/index.html | 6 +- doc/gutenprint/html/list_8h.html | 6 +- doc/gutenprint/html/module_8h.html | 34 +- doc/gutenprint/html/modules.html | 6 +- doc/gutenprint/html/mxml_8h.html | 94 +- doc/gutenprint/html/pages.html | 6 +- doc/gutenprint/html/paper_8h.html | 6 +- doc/gutenprint/html/path_8h.html | 10 +- doc/gutenprint/html/printers_8h.html | 6 +- doc/gutenprint/html/sequence_8h.html | 6 +- doc/gutenprint/html/string-list_8h.html | 28 +- .../html/structdither__matrix__impl.html | 38 +- .../html/structstp__cached__curve__t.html | 16 +- doc/gutenprint/html/structstp__color.html | 14 +- doc/gutenprint/html/structstp__colorfuncs__t.html | 16 +- .../html/structstp__curve__point__t.html | 12 +- .../html/structstp__dither__matrix__generic.html | 18 +- .../html/structstp__dither__matrix__normal.html | 18 +- .../html/structstp__dither__matrix__short.html | 18 +- doc/gutenprint/html/structstp__dotsize.html | 12 +- .../html/structstp__double__bound__t.html | 12 +- doc/gutenprint/html/structstp__family.html | 12 +- doc/gutenprint/html/structstp__image.html | 24 +- doc/gutenprint/html/structstp__int__bound__t.html | 12 +- doc/gutenprint/html/structstp__lineactive__t.html | 12 +- doc/gutenprint/html/structstp__linebounds__t.html | 14 +- doc/gutenprint/html/structstp__linebufs__t.html | 12 +- doc/gutenprint/html/structstp__linecount__t.html | 12 +- doc/gutenprint/html/structstp__lineoff__t.html | 12 +- doc/gutenprint/html/structstp__module.html | 24 +- .../html/structstp__module__version.html | 12 +- doc/gutenprint/html/structstp__mxml__attr__s.html | 12 +- doc/gutenprint/html/structstp__mxml__node__s.html | 22 +- doc/gutenprint/html/structstp__mxml__text__s.html | 12 +- doc/gutenprint/html/structstp__mxml__value__s.html | 14 +- doc/gutenprint/html/structstp__papersize__t.html | 28 +- .../html/structstp__param__string__t.html | 12 +- doc/gutenprint/html/structstp__parameter__t.html | 62 +- doc/gutenprint/html/structstp__pass__t.html | 20 +- doc/gutenprint/html/structstp__printfuncs__t.html | 30 +- doc/gutenprint/html/structstp__raw__t.html | 12 +- doc/gutenprint/html/structstp__shade.html | 14 +- doc/gutenprint/html/structstp__weave__t.html | 22 +- doc/gutenprint/html/unionstp__mxml__value__u.html | 18 +- doc/gutenprint/html/util_8h.html | 6 +- doc/gutenprint/html/vars_8h.html | 6 +- doc/gutenprint/html/weave_8h.html | 60 +- doc/gutenprint/html/xml_8h.html | 50 +- doc/gutenprintui2/gutenprintui2.tag | 12 +- doc/gutenprintui2/html/annotated.html | 6 +- doc/gutenprintui2/html/classes.html | 6 +- doc/gutenprintui2/html/curve_8h.html | 46 +- doc/gutenprintui2/html/dir_000000.html | 6 +- doc/gutenprintui2/html/dir_000001.html | 6 +- doc/gutenprintui2/html/dirs.html | 6 +- doc/gutenprintui2/html/files.html | 6 +- doc/gutenprintui2/html/functions.html | 6 +- doc/gutenprintui2/html/functions_vars.html | 6 +- doc/gutenprintui2/html/gammacurve_8h.html | 26 +- doc/gutenprintui2/html/globals.html | 6 +- doc/gutenprintui2/html/globals_defs.html | 6 +- doc/gutenprintui2/html/globals_enum.html | 6 +- doc/gutenprintui2/html/globals_eval.html | 6 +- doc/gutenprintui2/html/globals_func.html | 6 +- doc/gutenprintui2/html/globals_type.html | 6 +- doc/gutenprintui2/html/gutenprintui_8h.html | 134 +- doc/gutenprintui2/html/index.html | 6 +- doc/gutenprintui2/html/struct__StpuiCurve.html | 38 +- .../html/struct__StpuiCurveClass.html | 20 +- .../html/struct__StpuiGammaCurve.html | 22 +- .../html/struct__StpuiGammaCurveClass.html | 18 +- doc/gutenprintui2/html/structstpui__image.html | 24 +- doc/gutenprintui2/html/structstpui__plist__t.html | 34 +- doc/gutenprintui2/html/typebuiltins_8h.html | 18 +- doc/users_guide/Makefile.in | 1 - doc/users_guide/html/a630.html | 181 --- doc/users_guide/html/book1.html | 487 +++++++ doc/users_guide/html/c29.html | 27 +- doc/users_guide/html/c443.html | 48 +- doc/users_guide/html/c568.html | 143 ++- doc/users_guide/html/c61.html | 220 ---- doc/users_guide/html/ch-gimp-and-gimp-print.html | 245 ++++ doc/users_guide/html/docbook.css | 12 + doc/users_guide/html/gfdl.html | 247 ++++ doc/users_guide/html/index.html | 511 -------- doc/users_guide/html/ln12.html | 93 ++ doc/users_guide/html/stylesheet-images/caution.gif | Bin 0 -> 1039 bytes doc/users_guide/html/stylesheet-images/home.gif | Bin 0 -> 995 bytes .../html/stylesheet-images/important.gif | Bin 0 -> 1081 bytes doc/users_guide/html/stylesheet-images/next.gif | Bin 0 -> 964 bytes doc/users_guide/html/stylesheet-images/note.gif | Bin 0 -> 1070 bytes doc/users_guide/html/stylesheet-images/prev.gif | Bin 0 -> 944 bytes doc/users_guide/html/stylesheet-images/tip.gif | Bin 0 -> 1029 bytes .../html/stylesheet-images/toc-blank.gif | Bin 0 -> 95 bytes .../html/stylesheet-images/toc-minus.gif | Bin 0 -> 843 bytes .../html/stylesheet-images/toc-plus.gif | Bin 0 -> 846 bytes doc/users_guide/html/stylesheet-images/up.gif | Bin 0 -> 922 bytes doc/users_guide/html/stylesheet-images/warning.gif | Bin 0 -> 1052 bytes doc/users_guide/html/x452.html | 35 +- doc/users_guide/html/x544.html | 19 +- doc/users_guide/html/x559.html | 41 +- doc/users_guide/html/x640.html | 27 +- doc/users_guide/html/x650.html | 21 +- doc/users_guide/html/x654.html | 21 +- doc/users_guide/html/x660.html | 21 +- doc/users_guide/html/x696.html | 21 +- doc/users_guide/html/x701.html | 21 +- doc/users_guide/html/x705.html | 21 +- doc/users_guide/html/x709.html | 21 +- doc/users_guide/html/x712.html | 21 +- doc/users_guide/html/x715.html | 21 +- doc/users_guide/html/x720.html | 21 +- doc/users_guide/html/x85.html | 123 +- doc/users_guide/users-guide.pdf | Bin 217286 -> 469875 bytes include/Makefile.in | 1 - include/gutenprint/Makefile.in | 1 - include/gutenprint/channel.h | 4 +- include/gutenprintui/Makefile.in | 1 - include/gutenprintui2/Makefile.in | 1 - m4/stp_release.m4 | 2 +- man/Makefile.in | 1 - po/cs.gmo | Bin 34442 -> 34442 bytes po/cs.po | 254 ++-- po/da.gmo | Bin 4198 -> 4198 bytes po/da.po | 247 ++-- po/de.gmo | Bin 32956 -> 32956 bytes po/de.po | 254 ++-- po/el.gmo | Bin 4362 -> 4362 bytes po/el.po | 254 ++-- po/en_GB.gmo | Bin 69404 -> 69180 bytes po/en_GB.po | 259 ++-- po/es.gmo | Bin 32382 -> 32382 bytes po/es.po | 254 ++-- po/fr.gmo | Bin 35150 -> 35150 bytes po/fr.po | 254 ++-- po/gutenprint.pot | 225 ++-- po/ja.gmo | Bin 32224 -> 32224 bytes po/ja.po | 254 ++-- po/nb.gmo | Bin 14021 -> 14021 bytes po/nb.po | 247 ++-- po/nl.gmo | Bin 26820 -> 26820 bytes po/nl.po | 254 ++-- po/pl.gmo | Bin 7345 -> 7345 bytes po/pl.po | 247 ++-- po/pt.gmo | Bin 34469 -> 34469 bytes po/pt.po | 254 ++-- po/sk.gmo | Bin 32850 -> 32850 bytes po/sk.po | 254 ++-- po/sv.gmo | Bin 34143 -> 34143 bytes po/sv.po | 254 ++-- samples/Makefile.in | 1 - scripts/Makefile.in | 1 - scripts/config.guess | 74 +- scripts/config.sub | 16 +- scripts/ltmain.sh | 588 +++++---- scripts/mkchlog | 2 +- src/Makefile.in | 1 - src/cups/Makefile.in | 1 - src/cups/cups-genppdupdate.in | 5 +- src/escputil/Makefile.in | 1 - src/foomatic/Makefile.in | 1 - src/ghost/Makefile.in | 1 - src/gimp/Makefile.in | 1 - src/gimp2/Makefile.in | 1 - src/gutenprintui/Makefile.in | 1 - src/gutenprintui/printrcl.c | 1325 +++++++++----------- src/gutenprintui/printrcy.c | 242 ++-- src/gutenprintui/printrcy.h | 4 +- src/gutenprintui2/Makefile.in | 1 - src/gutenprintui2/printrcl.c | 1325 +++++++++----------- src/gutenprintui2/printrcy.c | 242 ++-- src/gutenprintui2/printrcy.h | 4 +- src/main/Makefile.in | 1 - src/main/channel.c | 171 ++- src/main/color-conversion.h | 3 +- src/main/color-conversions.c | 115 +- src/main/escp2-channels.c | 14 +- src/main/escp2-papers.c | 90 +- src/main/print-canon.c | 18 +- src/main/print-color.c | 67 +- src/main/print-escp2.c | 50 +- src/main/print-lexmark.c | 18 +- src/main/print-pcl.c | 18 +- src/testpattern/Makefile.in | 1 - src/testpattern/testpatternl.c | 1322 +++++++++---------- src/testpattern/testpatterny.c | 252 ++-- src/testpattern/testpatterny.h | 4 +- test/Makefile.in | 1 - 285 files changed, 12430 insertions(+), 11524 deletions(-) create mode 100644 doc/developer/reference-html/HTML.manifest delete mode 100644 doc/developer/reference-html/a2122.html create mode 100644 doc/developer/reference-html/book1.html create mode 100644 doc/developer/reference-html/docbook.css create mode 100644 doc/developer/reference-html/gpl-terms.html create mode 100644 doc/developer/reference-html/gpl.html delete mode 100644 doc/developer/reference-html/index.html create mode 100644 doc/developer/reference-html/ln10.html create mode 100644 doc/developer/reference-html/stylesheet-images/caution.gif create mode 100644 doc/developer/reference-html/stylesheet-images/home.gif create mode 100644 doc/developer/reference-html/stylesheet-images/important.gif create mode 100644 doc/developer/reference-html/stylesheet-images/next.gif create mode 100644 doc/developer/reference-html/stylesheet-images/note.gif create mode 100644 doc/developer/reference-html/stylesheet-images/prev.gif create mode 100644 doc/developer/reference-html/stylesheet-images/tip.gif create mode 100644 doc/developer/reference-html/stylesheet-images/toc-blank.gif create mode 100644 doc/developer/reference-html/stylesheet-images/toc-minus.gif create mode 100644 doc/developer/reference-html/stylesheet-images/toc-plus.gif create mode 100644 doc/developer/reference-html/stylesheet-images/up.gif create mode 100644 doc/developer/reference-html/stylesheet-images/warning.gif delete mode 100644 doc/developer/reference-html/x2153.html create mode 100644 doc/gutenprint/html/functions_rela.html delete mode 100644 doc/users_guide/html/a630.html create mode 100644 doc/users_guide/html/book1.html delete mode 100644 doc/users_guide/html/c61.html create mode 100644 doc/users_guide/html/ch-gimp-and-gimp-print.html create mode 100644 doc/users_guide/html/docbook.css create mode 100644 doc/users_guide/html/gfdl.html delete mode 100644 doc/users_guide/html/index.html create mode 100644 doc/users_guide/html/ln12.html create mode 100644 doc/users_guide/html/stylesheet-images/caution.gif create mode 100644 doc/users_guide/html/stylesheet-images/home.gif create mode 100644 doc/users_guide/html/stylesheet-images/important.gif create mode 100644 doc/users_guide/html/stylesheet-images/next.gif create mode 100644 doc/users_guide/html/stylesheet-images/note.gif create mode 100644 doc/users_guide/html/stylesheet-images/prev.gif create mode 100644 doc/users_guide/html/stylesheet-images/tip.gif create mode 100644 doc/users_guide/html/stylesheet-images/toc-blank.gif create mode 100644 doc/users_guide/html/stylesheet-images/toc-minus.gif create mode 100644 doc/users_guide/html/stylesheet-images/toc-plus.gif create mode 100644 doc/users_guide/html/stylesheet-images/up.gif create mode 100644 doc/users_guide/html/stylesheet-images/warning.gif diff --git a/ChangeLog b/ChangeLog index feab13b..ecdfc32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,98 @@ +2005-07-15 + + Files: NEWS (1.225) (+13 -8) + README (1.150) (+76 -71) + + Minor updates + +2005-07-15 + + Files: configure.ac (1.128) (+5 -3) + + Turn on PPD file translation. + +2005-07-15 + + Files: NEWS (1.224) (+12 -8) + + Note bug fix for boundary condition with 6-color printing. + +2005-07-14 + + Files: src/main/channel.c (1.29) (+3 -1) + + Fix boundary condition identified by Stephen Tweedie. + +2005-07-13 + + Files: NEWS (1.223) (+282 -483) + README (1.149) (+30 -36) + + Prep for 5.0.0-rc1 + +2005-07-13 + + Files: scripts/mkchlog (1.9) (+1 -1) + + Properly identify branch lists in comments. + +2005-07-04 + + Files: src/cups/cups-genppdupdate.in (1.20) (+2 -3) + + Relax PPD permissions and ownership checks. + +2005-07-04 + + Files: NEWS (1.222) (+1 -1) + + Advance release. + +2005-07-04 + + Files: src/main/color-conversion.h (1.10) (+1 -2) + src/main/color-conversions.c (1.20) (+1 -106) + src/main/print-color.c (1.131) (+1 -3) + + Remove dead code + +2005-07-04 + + Files: src/main/channel.c (1.28) (+35 -22) + + Fix all known combinations of split output, GCR, extra color channels, + and gloss. + +2005-07-03 + + Files: include/gutenprint/channel.h (1.6) (+3 -1) + src/main/channel.c (1.27) (+113 -5) + src/main/color-conversions.c (1.19) (+27 -23) + src/main/escp2-channels.c (1.56) (+5 -5) + src/main/escp2-papers.c (1.77) (+35 -35) + src/main/print-canon.c (1.156) (+9 -9) + src/main/print-color.c (1.130) (+44 -21) + src/main/print-escp2.c (1.341) (+25 -25) + src/main/print-lexmark.c (1.150) (+9 -9) + src/main/print-pcl.c (1.139) (+9 -9) + + Do the composite generation in GCR by adding the composite component + back in rather than subtracting the black ink component out. This + enables us to adjust the grayscale without changing the channel + densities, which permits us to get more gamut out of inksets + with radically unbalanced colors. + + ***NOTE*** At present, gloss generation is broken (segfaults). + This does not appear to be a new problem; I still need to identify + where this broke. + +2005-07-02 + + Files: src/main/escp2-channels.c (1.55) (+3 -3) + src/main/escp2-papers.c (1.76) (+20 -20) + + Improvements for the R300. + 2005-07-01 Files: Makefile.am (1.143) (+2 -19) @@ -194,34 +289,13 @@ Fix unnecessary warnings. -2005-06-07 - - Files: src/main/print-escp2.h (1.93) (+5 -2) - - branches: 1.93.2; 1.93.4; - New formulation of DuraBrite inks on C82, C84, and C86 permit using - black ink with glossy paper. - -2005-06-07 - - Files: src/main/escp2-papers.c (1.68) (+89 -1) - - branches: 1.68.2; 1.68.4; - New formulation of DuraBrite inks on C82, C84, and C86 permit using - black ink with glossy paper. - -2005-06-07 - - Files: src/main/print-escp2-data.c (1.175) (+4 -4) - - New formulation of DuraBrite inks on C82, C84, and C86 permit using - black ink with glossy paper. - 2005-06-07 Files: src/main/escp2-channels.c (1.51) (+15 -4) + src/main/escp2-papers.c (1.68) (+89 -1) + src/main/print-escp2-data.c (1.175) (+4 -4) + src/main/print-escp2.h (1.93) (+5 -2) - branches: 1.51.2; 1.51.4; New formulation of DuraBrite inks on C82, C84, and C86 permit using black ink with glossy paper. @@ -286,7 +360,8 @@ 2005-05-08 - Files: src/main/color-conversions.c (1.16) (+43 -42) + Files: src/main/channel.c (1.25) (+17 -8) + src/main/color-conversions.c (1.16) (+43 -42) src/main/escp2-channels.c (1.49) (+3 -3) src/main/escp2-papers.c (1.67) (+102 -102) src/main/print-canon.c (1.155) (+7 -7) @@ -302,20 +377,6 @@ Improve tunings of R800. In particular, use much less yellow ink. The yellow ink on the R800 appears to be very strong indeed. -2005-05-08 - - Files: src/main/channel.c (1.25) (+17 -8) - - branches: 1.25.2; 1.25.4; - Simplify and improve luminosity correction by performing the luminosity - adjustment on the color component only, ignoring the gray component. - This solves some problems with dark cyans and greens, whereby they - improperly lose some gray component. This requires retuning all - printers, which has been approximated here. - - Improve tunings of R800. In particular, use much less yellow ink. - The yellow ink on the R800 appears to be very strong indeed. - 2005-05-07 Files: test/testdither.c (1.48) (+77 -12) @@ -378,7 +439,6 @@ Files: src/escputil/escputil.c (1.74) (+1 -2) - branches: 1.74.2; 1.74.4; Remove inappropriate close call. 2005-04-25 @@ -646,13 +706,7 @@ 2005-04-15 Files: src/main/escp2-inks.c (1.37) (+4 -2) - - branches: 1.37.2; 1.37.4; - Use only the smallest drop size at 2880x2880 on R800 - -2005-04-15 - - Files: src/main/print-escp2-data.c (1.171) (+2 -2) + src/main/print-escp2-data.c (1.171) (+2 -2) Use only the smallest drop size at 2880x2880 on R800 @@ -765,7 +819,6 @@ Files: src/gutenprintui2/plist.c (1.4) (+3 -3) - branches: 1.4.2; 1.4.4; Quote printer queue names (from Sven Neumann) 2005-04-09 @@ -833,25 +886,12 @@ Minor updates from Mike Sweet. -2005-04-05 - - Files: src/main/print-escp2.h (1.91) (+10 -2) - - Autodetect printer, and print ink colors in escputil appropriate - for the printer. - -2005-04-05 - - Files: src/main/print-escp2.c (1.335) (+19 -1) - - branches: 1.335.2; 1.335.4; - Autodetect printer, and print ink colors in escputil appropriate - for the printer. - 2005-04-05 Files: src/escputil/escputil.c (1.66) (+113 -64) src/main/print-escp2-data.c (1.170) (+152 -70) + src/main/print-escp2.c (1.335) (+19 -1) + src/main/print-escp2.h (1.91) (+10 -2) Autodetect printer, and print ink colors in escputil appropriate for the printer. @@ -931,23 +971,12 @@ Preliminary tunings for R800 matte based on glossy numbers. -2005-03-28 - - Files: src/main/print-escp2.c (1.332) (+16 -4) - - Add support for gloss enhancer - 2005-03-28 Files: include/gutenprint/channel.h (1.4) (+3 -1) - - branches: 1.4.2; 1.4.4; - Add support for gloss enhancer - -2005-03-28 - - Files: src/main/channel.c (1.22) (+104 -21) + src/main/channel.c (1.22) (+104 -21) src/main/escp2-channels.c (1.42) (+11 -11) + src/main/print-escp2.c (1.332) (+16 -4) Add support for gloss enhancer @@ -6086,7 +6115,6 @@ Files: src/main/print-util.c (1.99) (+1 -21) - branches: 1.99.2; 1.99.6; Finish getting rid of xio. 2003-07-24 @@ -7426,7 +7454,6 @@ Files: NEWS (1.102) (+15 -16) - branches: 1.102.2; 1.102.4; Prep for 4.3.14 2003-05-11 @@ -7649,7 +7676,6 @@ Files: po/cs.po (1.1) ( ) - branches: 1.1.2; 1.1.4; file cs.po was initially added on branch gimp-print-4_2_branch. 2003-04-28 @@ -7897,21 +7923,12 @@ Change Foomatic names to the new database names. -2003-04-10 - - Files: src/main/printers.xml (1.71) (+33 -1) - - branches: 1.71.4; 1.71.6; - Add support for Japanese Epson printers CL-760, PM-740C, PM-870C, - PM-930C, and PM-3700C. I'm confident about all of these printers - except for the PM-930C (the spacing may be wrong) and the PM-870C - (may be equivalent to the Stylus Photo 925 rather than the 915). - 2003-04-10 Files: NEWS (1.96) (+10 -0) src/foomatic/foomatic-printermap (1.53) (+5 -0) src/main/print-escp2-data.c (1.104) (+17 -1) + src/main/printers.xml (1.71) (+33 -1) Add support for Japanese Epson printers CL-760, PM-740C, PM-870C, PM-930C, and PM-3700C. I'm confident about all of these printers @@ -8317,7 +8334,6 @@ Files: src/main/module.c (1.11) (+3 -2) - branches: 1.11.4; 1.11.6; Check that a module exists before attempting to close it. 2003-03-19 @@ -8991,7 +9007,19 @@ 2003-01-20 - Files: src/main/module.c (1.7) (+90 -90) + Files: src/main/Makefile.am (1.62) (+1 -2) + src/main/bit-ops.c (1.2) (+29 -29) + src/main/curve.c (1.22) (+77 -77) + src/main/dither-ed.c (1.3) (+33 -33) + src/main/dither-eventone.c (1.4) (+40 -40) + src/main/dither-impl.h (1.3) (+32 -32) + src/main/dither-inks.c (1.2) (+58 -58) + src/main/dither-inlined-functions.h (1.2) (+4 -4) + src/main/dither-main.c (1.4) (+82 -82) + src/main/dither-ordered.c (1.3) (+14 -14) + src/main/dither-very-fast.c (1.3) (+13 -13) + src/main/image.c (1.3) (+18 -18) + src/main/module.c (1.7) (+90 -90) src/main/path.c (1.6) (+26 -26) src/main/print-canon.c (1.106) (+121 -121) src/main/print-color.c (1.52) (+60 -60) @@ -9017,29 +9045,6 @@ Rename all internal stp_ things to stpi_ -2003-01-20 - - Files: src/main/image.c (1.3) (+18 -18) - - branches: 1.3.12; 1.3.16; - Rename all internal stp_ things to stpi_ - -2003-01-20 - - Files: src/main/Makefile.am (1.62) (+1 -2) - src/main/bit-ops.c (1.2) (+29 -29) - src/main/curve.c (1.22) (+77 -77) - src/main/dither-ed.c (1.3) (+33 -33) - src/main/dither-eventone.c (1.4) (+40 -40) - src/main/dither-impl.h (1.3) (+32 -32) - src/main/dither-inks.c (1.2) (+58 -58) - src/main/dither-inlined-functions.h (1.2) (+4 -4) - src/main/dither-main.c (1.4) (+82 -82) - src/main/dither-ordered.c (1.3) (+14 -14) - src/main/dither-very-fast.c (1.3) (+13 -13) - - Rename all internal stp_ things to stpi_ - 2003-01-20 Files: src/cups/genppd.c (1.58) (+6 -6) @@ -11665,24 +11670,6 @@ Fix some comments. -2002-08-21 - - Files: src/testpattern/testpattern.c (1.8) (+197 -22) - src/testpattern/testpattern.h (1.4) (+23 -1) - src/testpattern/testpatternl.l (1.4) (+10 -1) - src/testpattern/testpatterny.y (1.5) (+76 -4) - test/testdither.c (1.16) (+8 -3) - test/unprint.c (1.24) (+35 -5) - - Allow specification of individual physical input channels - -2002-08-21 - - Files: src/testpattern/extended.sample (1.2) (+117 -0) - - branches: 1.2.2; 1.2.6; - Allow specification of individual physical input channels - 2002-08-21 Files: NEWS (1.74) (+15 -1) @@ -11700,6 +11687,13 @@ src/main/print-pcl.c (1.55) (+5 -3) src/main/print-util.c (1.68) (+2 -2) src/main/printers.xml (1.51) (+85 -4) + src/testpattern/extended.sample (1.2) (+117 -0) + src/testpattern/testpattern.c (1.8) (+197 -22) + src/testpattern/testpattern.h (1.4) (+23 -1) + src/testpattern/testpatternl.l (1.4) (+10 -1) + src/testpattern/testpatterny.y (1.5) (+76 -4) + test/testdither.c (1.16) (+8 -3) + test/unprint.c (1.24) (+35 -5) Allow specification of individual physical input channels @@ -12406,7 +12400,6 @@ Files: po/es.po (1.1) ( ) - branches: 1.1.2; 1.1.4; Spanish translation 2002-04-28 @@ -12495,7 +12488,6 @@ Files: src/main/print-escp2-data.c (1.15) (+2 -2) - branches: 1.15.2; 1.15.4; 1.15.6; Change settings for Matte paper and 4 color printers. 2002-04-09 @@ -12563,32 +12555,12 @@ Reformatting of the escputil examples. I thought they looked ugly on the right margin when printed. -2002-04-07 - - Files: doc/users_guide/history.sgml (1.1) ( ) - - branches: 1.1.2; 1.1.4; - - - Renamed files to make it easier to deal with multiple versions - of the manual. Fixed (I think) the make dist problem in Makefile.am. - Updated users-guide.sgml to use new file names for chapter files. - -2002-04-07 - - Files: doc/users_guide/gimp.sgml (1.1) ( ) - - branches: 1.1.2; 1.1.4; 1.1.34; - - - Renamed files to make it easier to deal with multiple versions - of the manual. Fixed (I think) the make dist problem in Makefile.am. - Updated users-guide.sgml to use new file names for chapter files. - 2002-04-07 Files: doc/users_guide/Makefile.am (1.33) (+6 -6) doc/users_guide/cups.sgml (1.1) ( ) + doc/users_guide/gimp.sgml (1.1) ( ) + doc/users_guide/history.sgml (1.1) ( ) doc/users_guide/title.sgml (1.1) ( ) doc/users_guide/users-guide.sgml (1.6) (+10 -10) doc/users_guide/utils.sgml (1.1) ( ) @@ -12634,20 +12606,10 @@ Let Foomatic data for GhostScript and IJS drivers go into separate directories (to simplify Debian packaging). -2002-04-06 - - Files: doc/users_guide/gfdl.sgml (1.1) ( ) - - branches: 1.1.2; 1.1.4; - - - Added chapter 4, the description of the escputil utility. Chapters now - have their own separate files and the entire document is pulled together - via the users-guide.sgml file. This necessitated a few Makefile changes. - 2002-04-06 Files: doc/users_guide/Makefile.am (1.31) (+21 -6) + doc/users_guide/gfdl.sgml (1.1) ( ) doc/users_guide/users-guide.sgml (1.5) (+15 -1869) @@ -12896,18 +12858,11 @@ Minor change to ink dot sizes. -2002-03-17 - - Files: src/main/print-escp2.h (1.7) (+17 -1) - - branches: 1.7.2; 1.7.4; 1.7.6; - Put inkname list (three color CMY, six color photo, etc.) into - printer list. - 2002-03-17 Files: src/main/print-escp2-data.c (1.12) (+100 -47) src/main/print-escp2.c (1.157) (+20 -56) + src/main/print-escp2.h (1.7) (+17 -1) Put inkname list (three color CMY, six color photo, etc.) into printer list. @@ -13273,13 +13228,7 @@ 2001-12-23 Files: test/run-testdither (1.3) (+6 -3) - - branches: 1.3.2; 1.3.4; 1.3.6; - A bit more cleanup work on the dither code. - -2001-12-23 - - Files: test/testdither.c (1.14) (+4 -4) + test/testdither.c (1.14) (+4 -4) A bit more cleanup work on the dither code. @@ -13718,7 +13667,6 @@ Files: src/main/print-ps.c (1.26) (+10 -4) - branches: 1.26.2; 1.26.4; Correct comments from Russell Lang . Reviewed by Mike Sweet. @@ -14011,20 +13959,6 @@ Improve 360x180 draft mode -2001-10-27 - - Files: test/parse-escp2 (1.5) (+1 -1) - - branches: 1.5.2; 1.5.6; - Strip trailing whitespace - -2001-10-27 - - Files: src/testpattern/testpatterny.y (1.3) (+6 -6) - - branches: 1.3.2; 1.3.6; - Strip trailing whitespace - 2001-10-27 Files: Makefile.am (1.119) (+2 -2) @@ -14040,7 +13974,9 @@ src/main/print-canon.c (1.71) (+2 -2) src/main/print-escp2.c (1.138) (+2 -2) src/main/print-lexmark.c (1.61) (+90 -90) + src/testpattern/testpatterny.y (1.3) (+6 -6) test/parse-bjc (1.3) (+3 -3) + test/parse-escp2 (1.5) (+1 -1) Strip trailing whitespace @@ -14192,7 +14128,6 @@ Files: src/main/print-color.c (1.26) (+8 -2) - branches: 1.26.2; 1.26.4; 473849 Indexed images print incorrectly in color 2001-10-20 @@ -14845,7 +14780,6 @@ Files: src/testpattern/testpattern.c (1.6) (+5 -1) - branches: 1.6.4; 1.6.8; Set a reasonable default resolution for use with Postscript driver. 2001-10-01 @@ -14915,7 +14849,6 @@ Files: test/unprint.c (1.22) (+64 -61) - branches: 1.22.4; 1.22.8; More cleanup 2001-09-28 @@ -15095,13 +15028,6 @@ Fix ink drop sizes for Epson 720 -2001-09-17 - - Files: src/main/Makefile.am (1.27) (+3 -2) - - branches: 1.27.2; 1.27.4; 1.27.6; - Remove non-portable 'make -C' usage. - 2001-09-17 Files: .cvsignore (1.15) (+1 -0) @@ -15111,6 +15037,7 @@ src/foomatic/Makefile.am (1.13) (+3 -2) src/ghost/Makefile.am (1.15) (+3 -2) src/gimp/Makefile.am (1.17) (+3 -2) + src/main/Makefile.am (1.27) (+3 -2) src/testpattern/Makefile.am (1.5) (+3 -2) test/Makefile.am (1.27) (+3 -2) @@ -15291,31 +15218,19 @@ Update en_GB translation Add genppd.c to POTFILE.in -2001-09-08 - - Files: src/main/print-dither-matrices.c (1.4) (+2 -2) - - branches: 1.4.4; 1.4.6; - All source uses the new i18n header in include/gimp-print - -2001-09-08 - - Files: src/main/print-weave.c (1.36) (+3 -3) - - branches: 1.36.4; 1.36.6; - All source uses the new i18n header in include/gimp-print - 2001-09-08 Files: src/main/Makefile.am (1.26) (+1 -2) src/main/print-canon.c (1.67) (+3 -3) src/main/print-color.c (1.24) (+3 -3) + src/main/print-dither-matrices.c (1.4) (+2 -2) src/main/print-escp2.c (1.111) (+3 -3) src/main/print-lexmark.c (1.53) (+3 -3) src/main/print-pcl.c (1.44) (+3 -3) src/main/print-ps.c (1.25) (+3 -3) src/main/print-util.c (1.47) (+3 -3) src/main/print-version.c (1.6) (+3 -3) + src/main/print-weave.c (1.36) (+3 -3) All source uses the new i18n header in include/gimp-print @@ -15403,22 +15318,6 @@ Stuff to ignore -2001-09-02 - - Files: test/escp2-weavetest.c (1.19) (+2 -2) - - branches: 1.19.4; 1.19.6; - Move gimp-print.h such that works both - within the source tree and outside it. - -2001-09-02 - - Files: test/testdither.c (1.11) (+3 -3) - - branches: 1.11.4; 1.11.6; - Move gimp-print.h such that works both - within the source tree and outside it. - 2001-09-02 Files: Makefile.am (1.108) (+2 -2) @@ -15443,6 +15342,8 @@ src/main/print-version.c (1.5) (+2 -2) src/main/print-weave.c (1.35) (+2 -2) src/testpattern/testpattern.c (1.4) (+62 -51) + test/escp2-weavetest.c (1.19) (+2 -2) + test/testdither.c (1.11) (+3 -3) Move gimp-print.h such that works both within the source tree and outside it. @@ -15461,16 +15362,10 @@ Apply ABI version patch, including debian packaging -2001-09-01 - - Files: src/testpattern/testpattern.sample (1.4) (+114 -3) - - branches: 1.4.2; 1.4.14; 1.4.18; - Cleanup and comment. - 2001-09-01 Files: src/testpattern/testpattern.c (1.3) (+1 -51) + src/testpattern/testpattern.sample (1.4) (+114 -3) Cleanup and comment. @@ -15701,18 +15596,12 @@ More release note updates. -2001-08-14 - - Files: src/testpattern/testpattern.h (1.2) (+1 -5) - src/testpattern/testpatternl.l (1.2) (+5 -1) - - branches: 1.2.2; 1.2.6; 1.2.10; - Putting config.h in the header doesn't seem to work... - 2001-08-14 Files: src/testpattern/Makefile.am (1.3) (+2 -2) src/testpattern/testpattern.c (1.2) (+5 -1) + src/testpattern/testpattern.h (1.2) (+1 -5) + src/testpattern/testpatternl.l (1.2) (+5 -1) src/testpattern/testpatterny.y (1.2) (+5 -1) Putting config.h in the header doesn't seem to work... @@ -16901,18 +16790,12 @@ Use "correct" vars in stp_choose_colorfunc. -2001-06-04 - - Files: src/main/.cvsignore (1.4) (+1 -0) - - branches: 1.4.6; 1.4.8; - Update .cvsignore - 2001-06-04 Files: .cvsignore (1.14) (+1 -0) debian/.cvsignore (1.5) (+1 -0) doc/.cvsignore (1.2) (+3 -0) + src/main/.cvsignore (1.4) (+1 -0) Update .cvsignore @@ -16933,15 +16816,6 @@ Remove CUPS_CFLAGS Add prototypes to printdefy.y -2001-06-03 - - Files: test/pcl-unprint.c (1.5) (+35 -35) - - branches: 1.5.6; 1.5.8; - Fix a lot of warnings. - - Improve color quality on plain paper with Epson printers. - 2001-06-03 Files: src/cups/canon.c (1.2) (+1 -1) @@ -16962,6 +16836,7 @@ src/main/print-util.c (1.28) (+39 -39) src/main/print-weave.c (1.24) (+3 -3) test/bjc-unprint.c (1.5) (+4 -4) + test/pcl-unprint.c (1.5) (+35 -35) test/testdither.c (1.10) (+4 -4) Fix a lot of warnings. @@ -17569,17 +17444,10 @@ Remove unused variable. -2001-04-21 - - Files: src/foomatic/foomatic-generator.in (1.3) (+10 -10) - - branches: 1.3.2; 1.3.4; - Extract data correctly from the library rather than trying to parse - source files. - 2001-04-21 Files: src/foomatic/Makefile.am (1.4) (+11 -3) + src/foomatic/foomatic-generator.in (1.3) (+10 -10) src/foomatic/paper_sizes.c (1.1) ( ) Extract data correctly from the library rather than trying to parse @@ -18139,7 +18007,6 @@ Files: test/bjc-unprint.c (1.2) (+21 -0) - branches: 1.2.2; 1.2.4; Added copyright information 2001-03-01 @@ -18445,21 +18312,14 @@ Files: src/main/Makefile.am (1.13) (+2 -2) - branches: 1.13.2; 1.13.4; Enable --disable-libgimpprint (link with previously installed version) Update gimppprint.m4 (help message alignment fixed) -2001-02-18 - - Files: src/main/printers.xml (1.9) (+9 -0) - - branches: 1.9.2; 1.9.4; - Stylus Photo 780 is US name for 790. - 2001-02-18 Files: src/escputil/escputil.c (1.8) (+2 -1) src/main/print-escp2.c (1.24) (+2 -2) + src/main/printers.xml (1.9) (+9 -0) Stylus Photo 780 is US name for 790. @@ -18493,7 +18353,6 @@ Files: src/main/print-util.c (1.8) (+92 -1) - branches: 1.8.2; 1.8.4; Embed vasprintf when compiling Ghostscript 2001-02-18 @@ -18505,17 +18364,11 @@ 2001-02-18 Files: src/main/print-escp2.c (1.21) (+39 -6) + src/main/print-weave.c (1.12) (+21 -26) test/escp2-weavetest.c (1.9) (+13 -2) changed head-offset initialization -2001-02-18 - - Files: src/main/print-weave.c (1.12) (+21 -26) - - branches: 1.12.2; 1.12.4; - changed head-offset initialization - 2001-02-18 Files: src/main/print-weave.c (1.11) (+43 -17) @@ -18545,7 +18398,6 @@ Files: src/main/print-canon.c (1.10) (+14 -1) - branches: 1.10.2; 1.10.4; Add nominal support for Canon BJC6500 2001-02-17 @@ -18559,7 +18411,6 @@ Files: src/gimp/print.c (1.4) (+2 -26) - branches: 1.4.2; 1.4.4; Remove dead support for wrting old printrc format 2001-02-17 @@ -18599,23 +18450,12 @@ Add Stylus Photo 1280 (appears to be a synonym for 1290). -2001-02-14 - - Files: src/main/print-lexmark.c (1.15) (+2 -2) - - branches: 1.15.2; 1.15.4; - Improve printing quality for variable dot size, 4 color printers. - This may be particularly noticeable at highly asymmetric resolutions, - such as 2880x720. - - Add 1440x360 modes to Epson printers. These are only enabled if - maintainer mode is enabled. - 2001-02-14 Files: acconfig.h (1.7) (+3 -1) src/main/print-canon.c (1.9) (+2 -2) src/main/print-escp2.c (1.18) (+10 -3) + src/main/print-lexmark.c (1.15) (+2 -2) Improve printing quality for variable dot size, 4 color printers. This may be particularly noticeable at highly asymmetric resolutions, @@ -18675,19 +18515,12 @@ Add new Epson 83 printer -- appears to be more or less a clone of the 880? -2001-02-11 - - Files: src/main/print-pcl.c (1.8) (+3 -12) - - branches: 1.8.2; 1.8.4; - Create a single dither function that decides what to do, rather than - each driver having to make the same decision. - 2001-02-11 Files: src/main/print-canon.c (1.8) (+3 -8) src/main/print-escp2.c (1.15) (+3 -8) src/main/print-lexmark.c (1.14) (+3 -15) + src/main/print-pcl.c (1.8) (+3 -12) Create a single dither function that decides what to do, rather than each driver having to make the same decision. @@ -18800,18 +18633,11 @@ Fix up maximum page length for many printers. -2001-02-03 - - Files: src/main/print-color.c (1.5) (+1 -5) - - branches: 1.5.2; 1.5.4; - Updated makefiles to properly link with libintl and libprintut.la - Removed inline checks from src/main/*.c - 2001-02-03 Files: src/cups/Makefile.am (1.15) (+4 -4) src/escputil/Makefile.am (1.5) (+2 -2) + src/main/print-color.c (1.5) (+1 -5) src/main/print-escp2.c (1.9) (+1 -5) src/main/print-util.c (1.6) (+1 -5) src/main/print-weave.c (1.8) (+1 -5) @@ -18846,21 +18672,6 @@ New output API -2001-02-03 - - Files: src/main/print-weave.c (1.7) (+18 -18) - - Convert direct printing to a file descriptor to print to an output - object passed in from the application. - -2001-02-03 - - Files: src/main/print-ps.c (1.5) (+58 -59) - - branches: 1.5.2; 1.5.4; - Convert direct printing to a file descriptor to print to an output - object passed in from the application. - 2001-02-03 Files: src/cups/rastertoprinter.c (1.7) (+14 -3) @@ -18869,7 +18680,9 @@ src/main/print-escp2.c (1.8) (+102 -105) src/main/print-lexmark.c (1.10) (+47 -51) src/main/print-pcl.c (1.6) (+109 -110) + src/main/print-ps.c (1.5) (+58 -59) src/main/print-util.c (1.5) (+75 -19) + src/main/print-weave.c (1.7) (+18 -18) Convert direct printing to a file descriptor to print to an output object passed in from the application. @@ -19229,13 +19042,6 @@ Fix gimp install -2001-01-23 - - Files: test/.cvsignore (1.1) ( ) - - branches: 1.1.4; 1.1.8; - Added .cvsignore - 2001-01-23 Files: .cvsignore (1.12) (+3 -0) @@ -19250,6 +19056,7 @@ src/ghost/.cvsignore (1.2) (+14 -0) src/gimp/.cvsignore (1.1) ( ) src/main/.cvsignore (1.1) ( ) + test/.cvsignore (1.1) ( ) Added .cvsignore diff --git a/Makefile.in b/Makefile.in index cd8235b..b818029 100644 --- a/Makefile.in +++ b/Makefile.in @@ -278,7 +278,6 @@ 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@ diff --git a/NEWS b/NEWS index a09f43d..19044b8 100644 --- a/NEWS +++ b/NEWS @@ -1,14 +1,11 @@ -This is a 5.0.0-rc1 prerelease CVS snapshot for Debian experimental only. -========================================================================= - -Welcome to Gutenprint 5.0.0-beta4! Please read these release notes +Welcome to Gutenprint 5.0.0-rc1! Please read these release notes carefully. Gutenprint, formerly named Gimp-Print, is a suite of printer drivers that may be used with most common UNIX print spooling systems, including CUPS, lpr, LPRng, or others. These drivers provide high -quality printing for UNIX (including Macintosh OS X 10.2 and 10.3) and -Linux systems that in many cases equal or exceed proprietary +quality printing for UNIX (including Macintosh OS X 10.2, 10.3, and +10.4) and Linux systems that in many cases equal or exceed proprietary vendor-supplied drivers in quality and functionality, and can be used for demanding printing tasks requiring flexibility and high quality. This software package includes the Print plug-in for the GIMP and @@ -22,24 +19,23 @@ important) piece of the package. Furthermore, the name Gutenprint recognizes Johannes Gutenberg, the inventor of the movable type printing press. Finally, the word "guten" means "good" in German. -Gutenprint 5.0.0-beta3 is the third beta prerelease of Gutenprint 5.0. +Gutenprint 5.0.0-rc1 is the first release candidate of Gutenprint 5.0. It is based on the Gimp-Print 4.3 series that has been in development -for over two years, and includes many improvements over the very -popular 4.2 series. This release is not considered to be a fully -stable release (there are still various things in flux, and it has not -undergone the extensive testing that is required to declare a release -stable), but we've been using it and we believe that it will be useful -for many purposes. +for over three years, and includes many improvements over the very +popular 4.2 series. This release is believed to be quite stable, but +further testing is required before final release. We believe this +release to be stable enough for day to day use, and encourage people +to test it and report their results. Gutenprint currently contains over 200 drivers supporting in excess of 600 printer models. The Print plug-in for the GIMP requires the GIMP 1.2.3 or above on the -1.2 line, or the GIMP 2.0 or 2.1. You may need to install packages -named "gimp-devel", "gtk-devel", and "glib-devel" (or similar -equivalents) on many systems. This plug-in will work with any -printing system, and offers a comprehensive user interface to control -all aspects of the printing process. +1.2 line (1.2.5 is recommended), or the GIMP 2.0 or above. You may +need to install packages named "gimp-devel", "gtk-devel", and +"glib-devel" (or similar equivalents) on many systems. This plug-in +will work with any printing system, and offers a comprehensive user +interface to control all aspects of the printing process. The CUPS driver requires CUPS 1.1.15 or higher. You may need to install a package named "cups-devel" or similar on many systems. @@ -59,12 +55,12 @@ create a driver that may be built much more easily than traditional Ghostscript drivers. The options for this driver are very complex, and it is normally used with the Foomatic driver integration system. -Users of Macintosh OS X 10.2 (Jaguar) and 10.3 (Panther) can use this -package, as the printing system is based on CUPS. For ease of -installation, a pre-built package with installer is normally supplied -a few days after the release of the source package. We highly -recommend that OS X users use the pre-built package rather than -attempt to build it themselves. +Users of Macintosh OS X 10.2 (Jaguar), 10.3 (Panther), and 10.4 +(Tiger) can use this package, as the printing system is based on CUPS. +For ease of installation, a pre-built package with installer is +normally supplied a few days after the release of the source package. +We highly recommend that OS X users use the pre-built package rather +than attempt to build it themselves. NOTE: This package will not work with any version of OS X 10.0 and 10.1 (such as 10.1.5), as those systems do not use CUPS as their @@ -79,385 +75,122 @@ on building and installing Gutenprint. These release notes contain the following sections: -1) Changes from 5.0.0-beta3 to 5.0.0-beta4 -2) Changes from 5.0.0-beta2 to 5.0.0-beta3 -3) Changes from 5.0.0-beta1 to 5.0.0-beta2 -4) Overall changes from 4.2 to 5.0. -5) List of supported printers -6) Printer-specific notes +1) Changes from 5.0.0-beta4 to 5.0.0-rc1 +2) Overall changes from 4.2 to 5.0. +3) List of supported printers +4) Printer-specific notes ================================================================ -* Major changes between Gutenprint 5.0.0 beta 3 and Gutenprint 5.0.0 beta 4: - - 1) The Foomatic data generator and ijsgutenprint (the Ghostscript - driver) now works correctly and supports the full range of - options. However, due to Foomatic limitations, additional steps - may be required to install the data and generate correct PPD - files. Please read these instructions carefully if you decide to - use Foomatic with Gutenprint 5.0.0-beta4. - - * The Foomatic driver is now named "gutenprint-ijs.5.0". When - you use foomatic-compiledb, foomatic-combo-xml or - foomatic-ppdfile, you must specify the driver name - appropriately. This permits installation of multiple releases - of Gutenprint on the same system. - - * Before installing Gutenprint 5.0.0-beta4, you must manually - remove any existing Foomatic option files. This is because the - Foomatic utility to load data kits (foomatic-kitload) does not - remove obsolete data files from the Foomatic database. If you - do not do this, any PPD files you generate will be incorrect - and printing may work incorrectly or not at all. - - Foomatic option files are usually located in - - /usr/local/share/foomatic/db/source/opt - - or - - /usr/share/foomatic/db/source/opt - - Assuming they're in the former location, you must remove data - files associated with the Gutenprint driver. The command to do - this, which must be run as the superuser (root) is - - cd /usr/local/share/foomatic/db/source/opt - ls -l gutenprint-ijs*.xml - - If there are existing files present, you must remove them: - - rm -f gutenprint-ijs*.xml - - Now check to make sure that they are gone: - - ls -l gutenprint-ijs*.xml - - CAUTION: Be very careful when typing this command! Minor - errors in typing these commands may result in severe damage to - your system. - - After this, you may run 'make install' in your Gutenprint - source directory to install the package. You will then need to - re-create any printer queues using Foomatic. - - In general, you will have to perform this procedure any time - you install a new version of Gutenprint. - - Please check the Foomatic site - (http://www.linuxprinting.org/foomatic.html) and the Gutenprint - site (http://gimp-print.sourceforge.net) for updated - instructions about this. - - * Unlike with the CUPS native driver, there is no simple way to - update all PPD files when you install a new version of - Gutenprint. You must either use the foomatic-ppdfile command - to upgrade PPD files individually, or foomatic-compiledb to - build all PPD files. - - * From this point forward, the Foomatic data will be version - locked to the Gutenprint release installed on the system. For - example, PPD files generated with the Foomatic data for this - release will not work with the ijsgutenprint in the next - release. This is to prevent accidentally using incorrect - data, which could cause incorrect function to take place. - - 2) Various problems with the native CUPS driver have been fixed: - - * The driver can now print directly to CD's with Epson printers - that support this functionality (e. g. the Stylus Photo R300). - In 5.0.0-beta3 and earlier, attempts to do so would have failed - with a message in the CUPS error log about options not being - verified correctly. If LogLevel=Debug were set in cupsd.conf, - the options that would have failed to verify would have been - CDInnerRadius and perhaps PageSize. There was no workaround - save to print from the GIMP plugin. This fixes bug 1179480. - - * It is now possible to select any page size when printing to CD. - It is still recommended to select CD - 5 inch or CD - 3 inch, - but other sizes will work and will be treated as a 5 inch CD. - If the page size selected is larger than 5 inches, the image - will be cropped to 5 inches; if it is smaller, it will be - expanded. - - This functionality is specific to the CUPS driver. In the GIMP - plugin, the only page sizes permitted are 5 inch and 3 inch CD. - - * An error message ("Unable to get media size") emitted when a - custom page size was set has been converted to a debug - message. - - * More useful error messages are generated when incorrect - combinations of options are chosen. In particular, the - incorrect options and values are properly identified. - - * The debug messages have been enhanced to allow tracing all - option settings. - - 3) The Epson Stylus Photo R800 and R1800 are now fully supported in - 6-color mode, for resolutions up to 2880x2880 DPI. The use of - gloss enhancer is now supported, although not used by default. - - It is likely that further tuning work will be performed on this - printer, so colors may not be the same as in future releases. - - 4) The definitions for the Epson Stylus CX3500, 3600, and 3650 have - been corrected, and these multi-function devices now work - correctly. Additional Epson multi-function devices have also - been added to the driver. - - 5) It is now possible to print to A4-size sheet paper on HP - DesignJet large-format plotter/printers. - - 6) With the Ghostscript driver, it is now possible to select any - page size when printing to CD. It is still recommended to select - CD - 5 inch or CD - 3 inch, but other sizes will work and will be - treated as a 5 inch CD. The page will be expanded or shrunk to - fit (not cropped). - - 7) Various improvements have been made to escputil, the command-line - Epson inkjet printer management utility. The changes are quite - extensive, and we would like feedback on their operation. - - * A new extended ink information command has been added. This - command, which is supported on printers with separate - individual ink cartridges, prints additional information about - the ink cartridge in addition to the amount of ink present. On - older printers, it simply returns the standard ink - information. - - * Ink level detection now works on all known supported printers. - Previously it did not work on some newer printers. However, it - is somewhat slower on these printers than it is on older - printers that support the faster ink detection method. - - * Ink level detection now prints the correct ink color names for - the printer model. - - * It may be necessary to use the -m option (to specify the - printer) with certain printers, even with commands such as -i. - This was previously not the case. In general, it should not be - necessary. - - * It is now no longer necessary to use the -u flag with certain - printers in most cases. The utility now autodetects the - printer model and generates appropriate commands in all cases. - - If you supply a printer queue (with the -P option) rather than - a raw device (with the -r option), you will still need to - provide the -u flag, as the utility cannot detect the actual - printer connected to a queue. However, bidirectional commands - (ink level, identify, printer status, and alignment) do not - require the -u flag any more. - - * escputil now successfully detects ink level, printer model, and - status even if the printer is out of ink. - - 8) The CUPS driver offers a new Color Precision option that enables - use of 16-bit printing with ESP Ghostscript 8.15 or Apple - Macintosh OS X 10.4 ("Tiger"). Setting Color Precision to "Best" - enables 16-bit printing if the system supports it; setting it to - "Normal" uses 8-bit printing. Setting Color Precision to "Best" - has no effect if the version of CUPS does not support 16-bit - printing; in that case, "Best" is still 8-bit. - - The higher precision may improve results with certain source - material, particularly if it contains smooth color gradients. - The result would be freedom from banding, particularly in - highlights where it might be visible with 8-bit color - computation. It may be somewhat slower than 8-bit printing. - - 9) The Print plugin now functions correctly even if a printer queue - name contains shell metacharacters. - - 10) The IJS-based Ghostscript driver is now installed as - "ijsgutenprint.5.0". This permits installation of multiple - releases of Gutenprint on the same system. - - 11) Preliminary support for Epson Colorio PM-G800 and PM-G820 - (Japan-market printers using 1.5 pl drops with traditional photo - inks). Also added other recent Japan-market printers assumed to - be programmatically identical to existing printers. - - 12) The old man pages, and src/ghost/README, have been withdrawn. - These pages, and the Ghostscript README file, were based on the - Gimp-Print 4.2 options, which were much less fluid than the - current option system. It is not practical to keep them up to - date in any meaningful way. Our recommendation is that people - use either the native CUPS driver or Foomatic to manage options - rather than attempt to create and manage printer queues by hand. - - 13) The source browser in the documentation package has been - removed. This information, which consists of color-coded source, - is of little interest to the vast majority of users and consumes - a significant amount of space in the installation. - - -================================================================ - -* Major changes between Gimp-Print 5.0.0 beta 2 and Gutenprint 5.0.0 beta 3: - - 1) The package has been renamed Gutenprint, and library and header - file names have been changed accordingly. All programs using - Gutenprint will need to be changed appropriately. - - 2) The package now compiles on all GIMP 2.x releases, such as 2.0 - and 2.2. - - 3) The GIMP plugin (both 1.2 and 2.x) now offers a copy count - option, to permit printing multiple copies of an image as a - single operation. - - 4) The Canon Selphy CP-400 and CP-500 are now supported. - - 5) Unitone and Hybrid Unitone dithering have been disabled in this - release due to some output problems that have been discovered. - We recommend use of EvenTone or Hybrid EvenTone dithering instead. - - 6) Color correction has been tweaked to improve tonality and hue. - - 7) Shared libraries now build correctly on AIX. - - 8) The Print plugin for the GIMP now handles unnamed images - correctly. - - 9) Various minor compilation problems have been fixed. - - 10) The Epson Stylus C65 and C66 has been retuned to improve quality - at 720x360 DPI. On these printers, the 720x360 DPI mode produces - significantly better output quality than on most other printers. - - At present, we do not know whether the C63 and C64 require the - same tunings as the C65 and C66. We would appreciate people - trying both the C64 and C66 drivers with this printer and - reporting to us which driver produces better output. - - 11) Various minor build problems have been resolved. - -================================================================ - -* Major changes between Gimp-Print 5.0.0 beta 1 and 5.0.0 beta 2: - - 1) Color generation has been adjusted to improve tonality. The - result should be more definition in the highlights and shadows - and overall lighter tone without reducing maximum density. - - This has been tested on some Epson printers, but has not been - comprehensively tested. Please report any issues you may find. - - Note that this change invalidates any profiles generated for - earlier versions of Gimp-Print. It is likely that additional - changes will be made prior to 5.0 final release. - - 2) Printing direct to CD on Epson printers that support it now - works. In addition, a choice of center hole size (16 mm or 43 - mm) is now offered. A fine adjustment is provided to permit - control over positioning of the image on the CD. This fine - adjustment setting is not available in the Foomatic interface at - present. - - It is likely that this support will be further enhanced prior to - final release of 5.0. - - 3) Additional dye sublimation printers (Canon CP-220 and CP-330, - Olympus P-200 and P-400) are now supported; the Olympus P-10 is - now partially supported. - - 4) Preliminary support for the Epson Stylus C45, C46, C65, C66, C85, - C86, CX-6600 and PX-V600. - - 5) Additional page sizes are now available for Olympus and related - photo printers (including certain Canon and Sony dye sublimation - printers). In addition, other supported page sizes now work - correctly on the Canon CP-100. - - 6) Ink drop sizes have been retuned for all 2880 DPI capable Epson - Stylus printers that use 4 pl drops (e. g. Stylus Color 880, - Stylus Photo 780). These should give better results at - resolutions below 2880x720 DPI. Please let us know if they don't - on any given printer. - - 7) A problem whereby the CUPS driver was linked incorrectly in - certain configurations is fixed. - - 8) The GIMP 2.0 plugin is now installed correctly in the GIMP 2.0 - plugin directory, rather than the GIMP 1.2 directory. - - 9) A problem with the GIMP plugin not properly exiting at the - completion of printing has been fixed. This was reported on - FreeBSD 4.10 and is system dependent. The symptom is that at - when the print plugin finished its work it would stick around, - and actual printing would not start until the GIMP itself was - exited. - - 10) The GIMP plugins now use less screen space by scrolling certain - options. - - 11) Black generation has been improved for the Epson Stylus Photo - R300 and related printers on many older paper types. In - particular, more black ink is now being used, which should give - more solid shadows with less color shift. - - 12) A "predithered" color correction mode is now available, in - conjunction with a "predithered" dither algorithm. These very - fast algorithms assume that the data has already been screened, - and simply perform a threshold with no correction whatsoever. - This is useful for certain custom applications. - - 13) The GIMP 2.0 plugin now uses new curve widgets, replacing the - GTK+ curve widgets. These widgets will undergo further - development, adding new functionality. - - 14) A problem with Canon 6-color inkjet printers whereby the - transition between light and dark inks is fixed. This problem - was specific to the 4.3/5.0 code line and was a regression from - 4.2. - - 15) A problem with Canon printers in DMT mode whereby vertical lines - were printed across the page is fixed. This problem was specific - to the 4.3/5.0 code line and was a regression from 4.2. - - 16) A few problems with the display of the preview window in the GIMP - plugin (both 1.2 and 2.0) are fixed. - - 17) Gimp-Print now compiles correctly on Solaris. - - 18) The GIMP 2.0 plugin now handles the version 3 printrc file - correctly. - - 19) The printers.xml file now has a more flexible format that - permits specifying arbitrary parameters. - - 20) A problem trying to print a grayscale file from the GIMP with a - pre-existing printrc file predating Gimp-Print 5.0 alpha-2 has - been fixed. Depending upon the system, the bug could cause data - corruption, a crash at startup, or erroneous display in the - preview window. - - 21) A problem whereby compiling with --enable-static fails in some - circumstances has been fixed. - - The following bugs have been fixed in this release: +* Major changes between Gutenprint 5.0.0 beta 4 and Gutenprint 5.0.0 + release candidate 1: + + 1) Color correction is greatly improved, particularly for Epson + printers. The following general and specific improvements have + been made: + + * The default gamma for all Epson printers has been increased to + resolve long-standing issues with overly dark prints. The user + gamma adjustment is specified as a correction, so the default + value of 1.0 will yield correct results. + + * Luminosity (darkness) correction has been simplified and + improved by performing correction only on the color component, + without adjusting the gray component. This improves dark cyans + and greens in particular, and generally yields smoother tonal + changes. + + * Red and blue generation for the Epson Stylus R800 and R1800 + (and for any future printers) has been completely revamped. It + is now done by using per-channel curves. This improves control + over the output and allows ink combinations that could not be + generated with the previous code. The most notable effect is + improved magenta. + + * Greens have been improved on all Epson printers and are now + considerably more saturated and less yellow. + + * Black generation has been improved on all printers, + particularly Epson printers using Ultrachrome (R) inks. + + * Photo (light cyan and light magenta) ink generation has been + improved on many Epson printers. + + * Composite gray generation is now done by adding in CMY inks + rather than subtracting out the gray component. This separates + the gray balance from the per-channel ink density, permitting + much better color saturation for certain printers with + unbalanced inks. In particular, the Epson R-series printers + can now generate much better orange, yellow, and green without + sacrificing neutrality of grayscale. + + * The operation of the Bright Colors color correction mode has + been changed, and is now much closer to the operation of High + Accuracy. The main difference is that highly saturated colors + now clip rather than taper off toward full saturation. This + will yield improved color brilliance with some loss of detail + in certain cases (particularly bright greens). + + * A new Correct Hue Only mode has been added that corrects ink + hue without adjusting darkness. This permits achieving greater + color saturation without losing hue accuracy, although many + colors will be too dark in this mode. + + 2) A problem that could on rare occasions cause blank areas on photo + printers has been fixed. The problem was more likely to be + observed when printing in 16-bit mode. + + 3) CUPS PPD files are now built with translations enabled. If you + do not want translated PPD files, configure the package with + + ./configure --disable-translated-cups-ppds + + 4) The Canon SELPHY CP-600 dye sublimation printer has been added. + + 5) The Epson Stylus C82, C84, and C86 now use black ink with glossy + paper. The ink in these printers has been reformulated and is + now compatible with glossy paper. + + 6) The Epson Stylus CX3650 now prints correctly (previously there + were minor vertical offset problems, yielding slightly blurry + prints). + + 7) New printing resolutions have been added for certain Epson + printers: + + * 720 DPI high quality has been added for all but the very oldest + Epson printers, and 1440x720 DPI highest quality has been added + for all Epson printers with an upper resolution limit of + 2880x720 DPI. We have received reports that 1440x720 highest + quality, which was present in Gimp-Print 4.2, often produces + better output than 2880x720 while requiring less computation. + + * 2880x2880 DPI resolution has been added for the Epson Stylus + C86 and similar printers, such as the CX6600. While this is + not likely to yield a great improvement over 2880x1440 DPI, + this may yield some improvement for certain kinds of line art + with very fine detail. In general, there is little advantage + to be had from any resolution above 1440x1440 DPI with this + printer. + + 8) The Epson Stylus RX425 is now explicitly supported. + + 9) Some problems with PPD file generation using cups-genppdconfig + have been fixed. In particular, PPD permission and ownership + checks have been relaxed to permit operation on more systems. + + 10) Debian packaging has been removed from this release. Debian + packaging will be handled by the maintainer outside of the + release. -951558 gimp-print 5.0.0-alpha3, bugs with --enable-static -980678 Canon DMT not correct -981304 gimp2 print plugin installed in wrong directory -981759 5.0.0-beta1 doesn't compile on sparc sunos 5.7 -982642 Canon 6200 Photo Ink Problems -1000661 GIMP plugin does not refresh preview correctly in some cases -1001029 Auto orientation not updated in preview (causes jumbling) -1001267 GIMP2 plugin does not handle v3 printrc format -1002380 Printing grayscale image w/old printrc file crashes at start -1003003 CUPS executables linked incorrectly -1013465 QUALITY - highlights and shadows blown out -1013470 QUALITY - ESP R300 generates poor black -1013565 GIMP plugin may not exit at completion + 11) On systems supporting shared library versioning, the shared + library is labeled with the correct release version rather than a + development version. ================================================================ -While Gutenprint 5.0 is not finalized, it contains many improvements -and changes from 4.2, as follows: +Overall changes between Gimp-Print 4.2 and Gutenprint 5.0: * General User-Visible Changes: @@ -503,14 +236,37 @@ and changes from 4.2, as follows: black or white points. * The Cyan, Magenta, and Yellow settings have been replaced with - separate settings for gamma and density for Cyan, Magenta, - Yellow, and Black. The Cyan, Magenta, and Yellow settings in - Gimp-Print 4.2 most closely correspond to the gamma settings in - 5.0. + separate settings for gamma, density, and gray balance for + Cyan, Magenta, Yellow, and Black. The Cyan, Magenta, and + Yellow settings in Gimp-Print 4.2 most closely correspond to + the gamma settings in 5.0. The per-channel density settings do not affect the color correction. They are applied after the color correction to - scale the individual channels. + scale the individual channels. The per-channel gray balance + settings adjust gray balance without affecting per-channel + density settings, permitting better color saturation without + compromising gray balance. + + 6) The Uncorrected color correction mode is recommended for users + who wish to use their own color (ICC or otherwise) profiles with + Gutenprint drivers. This will yield the maximum gamut and most + uniform response. If you are not using your own color + management, you will generally get best results from the High + Accuracy color correction setting. + + 7) The old man pages, and src/ghost/README, have been withdrawn. + These pages, and the Ghostscript README file, were based on the + Gimp-Print 4.2 options, which were much less extensive than the + current option system. It is not practical to keep them up to + date in any meaningful way. Our recommendation is that people + use either the native CUPS driver or Foomatic to manage options + rather than attempt to create and manage printer queues by hand. + + 8) The source browser in the documentation package has been + removed. This information, which consists of color-coded source, + is of little interest to the vast majority of users and consumes + a significant amount of space in the installation. * New Functionality: @@ -523,6 +279,9 @@ and changes from 4.2, as follows: + Balance (density) controls for each channel, in addition to the gamma controls present in 4.2. + + Gray balance controls for the cyan, magenta, and yellow + channels. + + Black (GCR) transition, including the transition gamma and the upper and lower limits. @@ -531,6 +290,10 @@ and changes from 4.2, as follows: + Transfer curves for each channel (cyan, magenta, yellow, black, and composite), allowing very precise control over the output. + + Transfer curves for generation of additional channels where + applicable, such as red and blue inks for the Epson Stylus + Photo R800 and R1800. + + Hue, saturation, and luminosity transfer curves. + Ink limit control. @@ -557,7 +320,11 @@ and changes from 4.2, as follows: vs. bidirectional at all resolutions. 8) The Epson driver now allows printing directly to CD's on printers - that support this functionality. + that support this functionality. In addition, a choice of center + hole size (16 mm or 43 mm) is now offered. A fine adjustment is + provided to permit control over positioning of the image on the + CD. This fine adjustment setting is not available in the + Foomatic interface at present. 9) The Epson driver now offers a choice of print head weave patterns. In addition to simplifying the resolution choices for @@ -618,6 +385,10 @@ and changes from 4.2, as follows: by applications that wish to perform their own dithering and use Gutenprint to generate printer-specific output only. + 19) A new Correct Hue Only color correction mode has been added that + performs partial color correction (adjusts hue, but not + darkness). + 19) The escputil command, which performs various printer administration activities on Epson Stylus printers, has a number of improvements: @@ -718,14 +489,24 @@ and changes from 4.2, as follows: 5.0-based releases. 4) An update script (cups-genppdupdate.5.0) is provided to update - PPD files between recent 4.3 and 5.0-based releases, preserving + PPD files between later 4.3 and 5.0-based releases, preserving option values where possible. This script will not update PPD files based on Gimp-Print 4.2, or Gimp-Print 4.3 releases prior to 4.3.21. 5) The CUPS driver now offers 16-bit printing as an option with ESP Ghostscript 8.15, and Apple Macintosh OS X 10.4 ("Tiger"), using - the new Color Precision control. + the new Color Precision control. Setting Color Precision to + "Best" enables 16-bit printing if the system supports it; setting + it to "Normal" uses 8-bit printing. Setting Color Precision to + "Best" has no effect if the version of CUPS does not support + 16-bit printing; in that case, "Best" is still 8-bit. + + The higher precision may improve results with certain source + material, particularly if it contains smooth color gradients. + The result would be freedom from banding, particularly in + highlights where it might be visible with 8-bit color + computation. It may be somewhat slower than 8-bit printing. 6) Due to the implementation of CUPS, it is necessary on some systems to link the programs associated with the CUPS driver (in @@ -771,11 +552,11 @@ and changes from 4.2, as follows: * Changes to Foomatic data generation: - 1) The Ghostscript IJS driver refuses to function with Foomatic PPD - files created for a different version of Gimp-Print or - Gutenprint, providing an error message indicating the problem. - This avoids problems caused by mismatches between the PPD files - and the driver. While mismatches are potentially not harmful in + 1) The Ghostscript IJS driver now functions only with Foomatic PPD + files created for the matching version of Gutenprint, providing + an error message indicating the problem if an incorrect PPD file + is used. This avoids problems caused by mismatches between the + PPD files and the driver. While mismatches are not harmful in all cases, they could cause problems ranging from failures to print with poor diagnostic messages to incorrect results. @@ -795,13 +576,15 @@ and changes from 4.2, as follows: printers have been fully tuned for the new color correction algorithms introduced for this release. + The default gamma has been changed to produce lighter midtones + with all Epson printers. + 2) The handling of variable drop sizes and photo inks (6 and 7 color - printers) has been completely rewritten, with the result being - that variable drop size printers with photo inks (such as most - Epson Stylus Photo and Stylus Pro printers) give much more - consistent results with fewer artifacts. In particular, colors - match correctly across all resolutions, which was not the case in - 4.2. + printers) has been completely revised, with the result being that + variable drop size printers with photo inks (such as most Epson + Stylus Photo and Stylus Pro printers) give much more consistent + results with fewer artifacts. In particular, colors match + correctly across all resolutions, which was not the case in 4.2. In 4.2, variable size drops and light inks were treated the same way; an "effective drop size" based on the relative size of the @@ -847,68 +630,14 @@ and changes from 4.2, as follows: algorithm, does not work optimally with variable drop sizes or photo printers in 4.2. - Secondly, several variations on this algorithm have been - introduced, yielding a family of high quality screening - algorithms for different applications. The first variation is - called Hybrid EvenTone. This dither algorithm perturbs the dot - positions slightly to break up some patterning seen in standard - EvenTone dithering in solid regions of pale tones, particularly - when printing with black ink only. This very slightly reduces - the smoothness of texture in exchange for largely eliminating - this undesirable patterning. This algorithm is also expected to - be more resistant to microbanding effects. - - The second variation is called UniTone. This dither algorithm - calculates the placement of all dots (except for yellow) using a - single EvenTone pass, not just all of the dots of one color. - This technique improves the quality when multiple inks must be - mixed, such as when color inks are used to produce gray. It does - so by ensuring that all dots are equally spaced. Typically when - printing neutral tones with EvenTone dithering the cyan, magenta, - and yellow dots are positioned very close to each other, even - though the individual cyan dots are well-positioned. This causes - the groups of dots to appear to be single, large dots. UniTone - dithering evens out the spacing between all dots, producing a - smoother texture. UniTone dithering only functions when printing - in color (or grayscale with multi-tone gray ink); when printing - with black ink only, it is exactly equivalent to EvenTone - dithering. UniTone dithering is generally slower than EvenTone. - - UniTone dithering works best at improving output when the drops - are already very small, which is usually at high resolutions. - With these small drops, the eye has difficulty distinguishing the - color of the individual drops, so their color tends to be - distinguished primarily by their darkness. While cyan ink is - lighter than black ink and magenta ink is lighter than cyan ink, - these differences are not overwhelming and hence the eye does not - perceive a difference between them. With large drops, the eye - perceives the color of the individual drops, and small spots - dominated by one ink become apparent. - - As noted above, UniTone dithers yellow separately. This is - because the yellow ink is much lighter than any other ink, and - the positions occupied by yellow drops appear as holes, reducing - the quality of the print. Even light cyan and light magenta inks - appear to be significantly darker than yellow. - - Experiments conducted to date suggest that UniTone works very - well on the printers such as the Epson Stylus C80 at high - resolutions, when the printer is using 3 picolitre drops. On the - Stylus Photo EX, at 1440x720 DPI, using 8 picolitre drops, - quality is improved significantly when printing in normal 6-color - mode but quality is slightly worse in 4-color mode, as the colors - of the drops are apparent. At 720 DPI (using 12 picolitre - drops), quality is improved in 6-color mode but degraded - significantly in 4-color mode. - - Finally, a Hybrid UniTone dither algorithm is provided, combining - the principles of both of the above. - - As noted above, UniTone dithering does not always work better - than EvenTone, although in most cases all of these algorithms - work much better than Adaptive Hybrid in 4.2. We suggest that - users requiring the highest quality experiment, using Hybrid - EvenTone as a baseline. + Secondly, a variation called Hybrid EvenTone has been added. + This dither algorithm perturbs the dot positions slightly to + break up some patterning seen in standard EvenTone dithering in + solid regions of pale tones, particularly when printing with + black ink only. This very slightly reduces the smoothness of + texture in exchange for largely eliminating this undesirable + patterning. This algorithm is also expected to be more resistant + to microbanding effects. 4) The conversion between black and composite (CMY) gray has been improved in this release, yielding more neutral grays on most @@ -1023,7 +752,72 @@ and changes from 4.2, as follows: 3) Edit cups-config to remove the reference to the run path. - 9) The fix for bug 929227 (Gimp-Print incorrectly attempts to build + 9) There are multiple issues that one must be aware of when using + Foomatic with Gutenprint. + + 1) Before installing any new release of Gutenprint 5.0, you must + manually remove any existing Foomatic option files. This is + because the Foomatic utility to load data kits + (foomatic-kitload) does not remove obsolete data files from + the Foomatic database. If you do not do this, any PPD files + you generate will be incorrect and printing may work + incorrectly or not at all. + + Foomatic option files are usually located in + + /usr/local/share/foomatic/db/source/opt + + or + + /usr/share/foomatic/db/source/opt + + Assuming they're in the former location, you must remove data + files associated with the Gutenprint driver. The command to do + this, which must be run as the superuser (root) is + + cd /usr/local/share/foomatic/db/source/opt + ls -l gutenprint-ijs*.xml + + If there are existing files present, you must remove them: + + rm -f gutenprint-ijs*.xml + + Now check to make sure that they are gone: + + ls -l gutenprint-ijs*.xml + + CAUTION: Be very careful when typing this command! Minor + errors in typing these commands may result in severe damage to + your system. + + After this, you may run 'make install' in your Gutenprint + source directory to install the package. You will then need to + re-create any printer queues using Foomatic. + + In general, you will have to perform this procedure any time + you install a new version of Gutenprint. + + Please check the Foomatic site + (http://www.linuxprinting.org/foomatic.html) and the Gutenprint + site (http://gimp-print.sourceforge.net) for updated + instructions about this. + + 2) Unlike with the CUPS native driver, there is no simple way to + update all PPD files when you install a new version of + Gutenprint. You must either use the foomatic-ppdfile command + to upgrade PPD files individually, or foomatic-compiledb to + build all PPD files. Your system may provide an alternate way + to install new PPD files, in which case you may use that + method. + + 3) From this point forward, the Foomatic data will be version + locked to the Gutenprint release installed on the system. For + example, PPD files generated with the Foomatic data for this + release will not work with the ijsgutenprint in the next + release. This is to prevent accidentally using incorrect + data, which could cause incorrect function to take place. + + 10) The fix for bug 929227 (Gimp-Print incorrectly attempts to build against GIMP 2.0) requires special build instructions if you are using a very old version of the GIMP 1.2 (versions affected are believed to include 1.2.0, 1.2.1, and 1.2.2). Specifically, you @@ -1062,12 +856,11 @@ and changes from 4.2, as follows: --with-gimp-prefix or --with-gimp-exec-prefix, and therefore do not need to use this workaround. - The Gutenprint and GIMP projects recommend upgrading to a newer - revision of the GIMP 1.2 (at the time these release notes are - written, the latest version is 1.2.5), which will not require - this workaround. This workaround is available in the event that - you cannot or do not wish to upgrade your installation of the - GIMP. + If you cannot upgrade to the GIMP 2.x, the Gutenprint and GIMP + projects recommend upgrading to revision of the GIMP 1.2.5, which + will not require this workaround. This workaround is available + in the event that you cannot or do not wish to upgrade your + installation of the GIMP. * Architectural Changes: @@ -1178,7 +971,13 @@ and changes from 4.2, as follows: ink channels directly. This facility was used to create a mechanism to more accurately tune printer inks. - 9) Use of true XML to store data about printers and paper sizes, and + 9) The color system can now generate arbitrary ink colors, lifting + the CMYK-only restriction in previous versions of the package. + This permits full support for the Epson Stylus Photo R800 and + R1800, which use red and blue ink in addition to the traditional + CMYK. + + 10) Use of true XML to store data about printers and paper sizes, and to represent new data types (sequences, curves, and arrays). This uses the "mxml" XML library, a fast, lightweight XML parser written by Mike Sweet for this project. Currently, the use of @@ -2231,12 +2030,19 @@ Printer-Specific Notes: vertical resolution merely requires more computation and printing time without yielding significantly better quality. + In some cases, we offer resolutions different from what Epson + advertises that have the same effect; for example, we offer + 2880x2880 DPI on the Epson Stylus C86 rather than the 5760x1440 + offered by Epson's native driver. + We do not currently plan to offer resolutions higher than 2880x2880 DPI on any Epson Stylus printer with a drop size of 1 - pl or larger. At the time of Gutenprint 5.0 Beta, the smallest - drop size offered by any Epson Stylus printer is 1.5 pl. If - such a printer is offered, we will evaluate whether to offer - higher resolutions. + pl or larger. At the time of Gutenprint 5.0 release, the + smallest drop size offered by any Epson Stylus printer is 1.5 + pl. If such a printer is offered, or we otherwise determine + that there are advantages to be had from offering such + resolutions, we will evaluate whether to offer higher + resolutions. * Many Epson printers (specifically, the Epson Stylus Color 740 and all newer printers) will not respond to ASCII text without a @@ -2258,4 +2064,3 @@ Printer-Specific Notes: (or whatever device your printer is connected to in place of /dev/lp0). If this returns status, it demonstrates that the link between your computer and printer is working. - diff --git a/README b/README index 9f3f63c..1caebb4 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ INTRODUCTION - This is Gutenprint version 5.0.0 beta 4, the fourth beta - prerelease of Gutenprint 5.0. Gutenprint, formerly named + This is Gutenprint version 5.0.0 release candidate 1, the first + release candidate of Gutenprint 5.0. Gutenprint, formerly named Gimp-Print, is a suite of printer drivers that may be used with most common UNIX print spooling systems, including CUPS, lpr, LPRng, or others. These drivers provide high quality printing for @@ -59,8 +59,8 @@ BASIC INSTALLATION "escputil". Directions for building other components are listed below. - Please check our web site at http://gutenprint.org for details - about what is and is not supported. + Please check our web site at http://gimp-print.sourceforge.net for + details about what is and is not supported. Please report any problems to gimp-print-devel@sourceforge.net. @@ -94,10 +94,10 @@ THE GIMP Gutenprint may be used as a plug-in for the GIMP, providing the ability to print images. If you wish to do so, you must use the - GIMP 1.2.3 or above on the 1.2 line, or the GIMP 2.0 or 2.1. - Please read the release notes in addition to this README, as there - have been some changes in procedure since Gimp-Print 4.2 if you - are using certain versions of the GIMP. + GIMP 1.2.3 or above on the 1.2 line, or any GIMP 2.x release (2.0, + 2.1, 2.2, etc.) Please read the release notes in addition to this + README, as there have been some changes in procedure since + Gimp-Print 4.2 if you are using certain versions of the GIMP. To build and install the GIMP Print plug-in for the GIMP 1.2: @@ -105,7 +105,7 @@ THE GIMP make make install - For the GIMP 2.0 or 2.1, the option "--with-gimp2" rather than + For the GIMP 2.0 or above, the option "--with-gimp2" rather than "--with-gimp" should be used. You may optionally specify --with-gimp or --with-gimp2 if you wish @@ -135,11 +135,9 @@ THE GIMP The GIMP 1.2 will not be supported in Gutenprint 5.1 and beyond. However, all Gutenprint 5.0 releases will support The GIMP 1.2. - The GIMP 2.0 plugin will eventually be migrated to The GIMP - project for The GIMP 2.2 release. It may be removed from the - Gutenprint distribution following Gutenprint 5.0, and it may not - support releases of The GIMP other than 2.0 in the Gutenprint 5.0 - release. + The GIMP 2.x plugin may eventually be migrated to The GIMP project + for a future GIMP release. It may be removed from the Gutenprint + distribution following Gutenprint 5.0. CUPS @@ -158,35 +156,62 @@ CUPS ./configure --with-cups make make install - /etc/software/init.d/cups restart + cups-genppdupdate.5.0 (OPTIONAL) + /etc/init.d/cups restart - The last command varies with your operating system; the purpose is - to restart the CUPS server (daemon) so that it sees the newly - installed driver. It is typically /etc/init.d/cups, + If you have installed CUPS as a precompiled package (e. g. it's + the standard printing system that your distribution uses), you may + need to install a separate development package (typically called + "cups-devel" or "cups-developer"). You will need to do this if + configure completes correctly, but "make" fails when building in + src/cups. The CUPS package typically installed by most + distributions only contains the components needed to run CUPS, not + those required to build additional CUPS drivers. + + The last command (/etc/init.d/cups restart) varies with your + operating system; the purpose is to restart the CUPS server + (daemon) so that it sees the newly installed driver. It is + typically /etc/init.d/cups, /etc/software/init.d/cups, /etc/rc.d/cups, or even /etc/rc.d/init.d/cups. Your system may have a different way to restart the CUPS server. OS X uses the following command: sudo /System/Library/StartupItems/PrintingServices/PrintingServices.sh restart + You may optionally choose to update your existing PPD files using + the command cups-genppdupdate.5.0, after which you should restart + CUPS as described above. We strongly recommend use of this update + procedure. This script will automatically update Gutenprint PPD + files from earlier versions. This script will only work with + Gimp-Print 4.3.21 or above, or any earlier version of Gutenprint; + it will not update Gimp-Print 4.2 PPD files. However, you may + install Gutenprint 5.0 alongside Gimp-Print 4.2, and use both + Gimp-Print 4.2 and Gutenprint 5.0 drivers concurrently. + Therefore, you need not convert a workflow based on Gimp-Print 4.2 + right away, but can gradually convert or even use both drivers for + different printer queues. + + If you do not choose to automatically update existing PPD files, + you should reinstall any printers that you are using Gutenprint + PPD files with. The Gutenprint driver and the PPD files must be + kept in sync, since the PPD files reflect the particular version + of the driver that they were built against. If you attempt to use + a version of Gutenprint with PPD files not built for that precise + version, the driver will fail with a diagnostic error message. + For example, PPD files built for Gutenprint 5.0.0-beta4 will not + work with driver version 5.0.0-rc1. You can identify printers + using Gutenprint PPD files by the name of the PPD file, which will + be something like: + + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(en) + NOTE for Linux (at least) users: If you are using CUPS 1.1.11 or higher, and you have a USB-connected printer, you must have a printer connected to each USB port that you plan to use and powered on when you restart CUPS. If you do not do so, you will - not be able to perform the following step (reinstalling the - printer), as described below. - - Following this, you must reinstall any printers that you are using - Gutenprint PPD's with. Such printers may be identified in any - CUPS front end (e. g. KUPS, or via the web interface) because they - look something like this: - - EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-beta4(en) - - If the version number (in this case, 5.0.0-beta4) does not match - the version of Gutenprint that you are installing, you must use - Modify Printer to force the new PPD file to get installed. - Failure to do so may lead to incorrect output and/or other errors! + not be able to reinstall the printer. It is only necessary to do + this if you wish to update PPD files manually; if you use + cups-genppdupdate.5.0, you do not need to do this. Starting with CUPS 1.1.11, you cannot choose an AppSocket connection and enter "usb:/dev/usblp0" or the like as the URI; you @@ -195,7 +220,7 @@ CUPS following in your CUPS error log (typically /var/log/cups/error_log): -E [21/Nov/2001:17:59:07 +0500] add_printer: bad device-uri attribute 'usb:/dev/usblp0'! +E [21/Nov/2001:17:59:07 +0500] add_printer: bad device-uri attribute 'usb:/dev/usb/lp0'! If the printer was turned on correctly, you will be given a choice of a USB connection in the Device dialog. @@ -214,49 +239,33 @@ E [21/Nov/2001:17:59:07 +0500] add_printer: bad device-uri attribute 'usb:/dev/u apparent when you use a CUPS front end to select a PPD file and you see something like this: - EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-beta4(en) - EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-beta4(en) - EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-beta4(en) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(en) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(en) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(en) rather than this: - EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-beta4(en) - EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-beta4(sv) - EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-beta4(fr) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(en) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(sv) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0-rc1(fr) you may wish to turn off the translation of PPD files: - ./configure --with-cups --without-translated-ppds + ./configure --with-cups --disable-translated-cups-ppds You may also wish to do this to greatly reduce the number of PPD files installed on your system, as the number of translations is large and growing. - The PPD files associated with this driver are for Level 2 - PostScript. CUPS implements most level 3 PostScript, but there - are a few constructs that are not implemented. For this reason, - we have chosen to define a LanguageLevel of 2 rather than 3. - PostScript level 3 files are smaller in some cases, and can - produce smoother gradients, but few applications generate Level 3 - PostScript. If you would like to use level 3 PostScript, you may - do - - ./configure --with-cups --enable-cups-level3-ppds - - Unless you fully understand what you are doing, we recommend not - doing this. + The PPD files associated with this driver are normally for Level 3 + PostScript. CUPS versions starting with 1.1.15 fully implement + Level 3 Postscript, but earlier versions do not implement a few + Level 3 constructs. The configuration script will attempt to + detect the version of CUPS and generate appropriate PPD files. If + you wish to build PPD files for Level 2 Postscript even with a + newer version of CUPS, you can run - If you do not wish to build the Gimp Print plugin, you must run - - ./configure --with-cups --without-gimp - - If you have installed CUPS as a precompiled package (e. g. it's - the standard printing system that your distribution uses), you may - need to install a separate development package (typically called - "cups-devel" or "cups-developer"). The CUPS package typically - installed by most distributions only contains the components - needed to run CUPS, not those required to build additional CUPS - drivers. + ./configure --with-cups --disable-cups-level3-ppds We recommend that all users who wish to use this package for general purpose printing install either CUPS or use Foomatic with @@ -272,16 +281,14 @@ FOOMATIC Gutenprint includes support for the Foomatic meta-driver package. This requires the foomatic-xml distribution. Foomatic is - available from http://www.linuxprinting.org/foomatic.html. It is - also available in Debian unstable. For best results, use the - version in cvs. The first version of Foomatic (the one used with - Gimp-Print 4.0) is not compatible with Gutenprint 5.0. Note that - the Foomatic driver was named `stp' in Gimp-Print 4.0; in - Gimp-Print 4.2 (and early 4.3) it was named `gimp-print' for the - Ghostscript ("stp") driver and "gimp-print-ijs" for the IJS - driver. In 5.0 only the "gutenprint-ijs" data is present. The - data for the Gimp-Print 4.2 driver is not compatible with the 5.0 - driver. + available from http://www.linuxprinting.org/foomatic.html. The + first version of Foomatic (the one used with Gimp-Print 4.0) is + not compatible with Gutenprint 5.0. Note that the Foomatic driver + was named `stp' in Gimp-Print 4.0; in Gimp-Print 4.2 (and early + 4.3) it was named `gimp-print' for the Ghostscript ("stp") driver + and "gimp-print-ijs" for the IJS driver. In 5.0 only the + "gutenprint-ijs" data is present. The data for the Gimp-Print 4.2 + driver is not compatible with the 5.0 driver. Furthermore, as of Gutenprint 5.0 the Foomatic driver will include the release version of Gutenprint in its name. Therefore, the @@ -380,15 +387,13 @@ GHOSTSCRIPT and beyond. We strongly recommend that end users not use this driver directly. - The available options are very complex, and the standard printer - configuration tools (such as apsfilter and magicfilter) do not - provide a convenient interface to the driver's capabilities. We - recommend that end users either install CUPS, as described above, - or use Foomatic to configure printer queues. We recommend using - CUPS with the native CUPS drivers described above. We recommend - using Foomatic to configure printer queues if you do not use CUPS - (e. g. you use LPRng, System V print spooling, or Berkeley print - spooling). + The available options are very complex and are subject to change, + and the standard printer configuration tools (such as apsfilter + and magicfilter) do not provide a convenient interface to the + driver's capabilities. We recommend that end users either install + CUPS, as described above, or use Foomatic to configure printer + queues, as described above. We no longer provide documentation on + manual use of this driver. Gutenprint 5.0 no longer provides the monolithic "stp" driver present in 4.2. This driver, which was linked directly into @@ -402,18 +407,12 @@ RECOMMENDED SETTINGS settings. The settings can be adjusted as necessary for particular combinations of ink, paper, and subject material. - We recommend use of the Adaptive Hybrid dithering algorithm in - most cases. Ordered dithering also works very well in many cases, - and is somewhat faster, but it does not work very well with text - and very fine details (certain kinds of line art), particularly at - high resolutions. Fast dithering is also quite usable in many - cases. - - On most inkjet printers, 600 or 720 dpi will produce very high - quality; 1200x1200 or 1440x720 dpi will produce extremely high - quality. On newer printers with very small drops, higher - resolutions such as 2880x1440 DPI may be required to achieve the - highest quality. + On most inkjet printers, using plain or coated inkjet paper, 600 + or 720 dpi will produce high quality; 1200x1200 or 1440x720 dpi + will produce extremely high quality. On newer printers with very + small drops, or when printing photographs to special photo paper, + higher resolutions such as 2880x1440 DPI may be required to + achieve the highest quality. SUPPORT @@ -547,10 +546,10 @@ KNOWN BUILD/INSTALLATION ISSUES version, the genppd program operated correctly. If instead the output looks like this: - src/cups$ zgrep LanguageVersion ppd/*/pcl-4.ppd.gz - ppd/C/pcl-4.ppd.gz:*LanguageVersion: English - ppd/da/pcl-4.ppd.gz:*LanguageVersion: English - ppd/en_GB/pcl-4.ppd.gz:*LanguageVersion: English + src/cups$ zgrep LanguageVersion ppd/*/stp-pcl-4.5.0.ppd.gz + ppd/C/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English + ppd/da/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English + ppd/en_GB/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English ... the program did not operate correctly. @@ -558,7 +557,7 @@ KNOWN BUILD/INSTALLATION ISSUES If you do not have 'zgrep' on your system, you can gunzip the PPD files, and use - grep LanguageVersion ppd/*/pcl-4.ppd + grep LanguageVersion ppd/*/stp-pcl-4.5.0.ppd to accomplish the same test. @@ -657,7 +656,7 @@ KNOWN BUILD/INSTALLATION ISSUES 4) Build the PPD files on a Linux-based system; they are portable. - 5) Use --without-translated-ppds on the configure command line + 5) Use --disable-translated-cups-ppds on the configure command line to suppress the translated PPD files altogether. Please feel free to contact us about this issue. @@ -665,7 +664,7 @@ KNOWN BUILD/INSTALLATION ISSUES * There are multiple issues that one must be aware of when using Foomatic with Gutenprint. - 1) Before installing Gutenprint 5.0.0-beta4, you must manually + 1) Before installing Gutenprint 5.0.0-rc1, you must manually remove any existing Foomatic option files. This is because the Foomatic utility to load data kits (foomatic-kitload) does not remove obsolete data files from the Foomatic database. If you diff --git a/aclocal.m4 b/aclocal.m4 index 55d3e8a..a0885cc 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -18,7 +18,7 @@ dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MO dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or dnl gthread is specified in MODULES, pass to glib-config dnl -AC_DEFUN(AM_PATH_GLIB, +AC_DEFUN([AM_PATH_GLIB], [dnl dnl Get the cflags and libraries from the glib-config script dnl @@ -214,7 +214,7 @@ main () dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS dnl -AC_DEFUN(AM_PATH_GTK, +AC_DEFUN([AM_PATH_GTK], [dnl dnl Get the cflags and libraries from the gtk-config script dnl @@ -406,7 +406,6 @@ main () # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # serial 47 AC_PROG_LIBTOOL -# Debian $Rev: 214 $ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -1025,7 +1024,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + testring="ABCD" case $build_os in msdosdjgpp*) @@ -1064,16 +1063,16 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && + while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ + = "XX$testring") >/dev/null 2>&1 && + new_result=`expr "X$testring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` - teststring=$teststring$teststring + testring=$testring$testring done - teststring= + testring= # Add a significant safety factor because C++ compilers can tack on massive # amounts of additional arguments before passing them to the linker. # It appears as though 1/2 is a usable value. @@ -1469,7 +1468,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -1582,7 +1581,7 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows - shrext_cmds=".dll" + shrext=".dll" need_version=no need_lib_prefix=no @@ -1647,7 +1646,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -1730,7 +1729,7 @@ hpux9* | hpux10* | hpux11*) need_version=no case "$host_cpu" in ia64*) - shrext_cmds='.so' + shrext='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -1745,7 +1744,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext_cmds='.sl' + shrext='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -1756,7 +1755,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext_cmds='.sl' + shrext='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -1827,8 +1826,8 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf` + sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -1840,18 +1839,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - knetbsd*-gnu) version_type=linux need_lib_prefix=no @@ -1922,7 +1909,7 @@ openbsd*) os2*) libname_spec='$name' - shrext_cmds=".dll" + shrext=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -2513,14 +2500,14 @@ bsdi4*) ;; cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh + # win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' + lt_cv_file_magic_cmd='win32_libid' ;; mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. + # win32_libid shell function, so use a weaker test based on 'objdump'. lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' lt_cv_file_magic_cmd='$OBJDUMP -f' ;; @@ -2579,10 +2566,19 @@ irix5* | irix6* | nonstopux*) # This must be Linux ELF. linux*) + case $host_cpu in + alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu | knetbsd*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -2931,7 +2927,7 @@ aix3*) fi ;; -aix4* | aix5*) +aix4*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -3379,7 +3375,7 @@ case $host_os in # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then @@ -3576,7 +3572,7 @@ case $host_os in ;; esac ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -4082,7 +4078,7 @@ aix3*) postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix4*) test "$enable_shared" = yes && enable_static=no ;; esac @@ -4224,7 +4220,7 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -4418,7 +4414,7 @@ DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" # Used on cygwin: assembler. -AS="$AS" +AS=$lt_AS # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -4437,7 +4433,7 @@ objext="$ac_objext" libext="$libext" # Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' +shrext='$shrext' # Executable file suffix (normally ""). exeext="$exeext" @@ -5066,7 +5062,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -5377,9 +5373,6 @@ ifelse([$1],[CXX],[ cygwin* | mingw*) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ;; - linux*) - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5509,7 +5502,7 @@ EOF fi ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5548,7 +5541,7 @@ EOF ;; linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds" supports_anon_versioning=no @@ -5567,7 +5560,6 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ else _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=no else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi @@ -5749,7 +5741,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext=".dll" # FIXME: Setting linknames here is a bad hack. _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5927,7 +5919,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6319,136 +6311,63 @@ SED=$lt_cv_path_SED AC_MSG_RESULT([$SED]) ]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_ifval([$1], [$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi - -fi[]dnl -])# PKG_PROG_PKG_CONFIG +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +AC_DEFUN([PKG_CHECK_MODULES], [ + succeeded=no -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) -else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) -pkg_failed=no -AC_MSG_CHECKING([for $1]) -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -if test $pkg_failed = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD - - ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met. -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details.])], - [$4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details. - -To get pkg-config, see .])], - [$4]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. # diff --git a/configure b/configure index db84a0b..e1bda51 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.127 . +# From configure.ac Revision: 1.128 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for gutenprint 5.0.0-rc1. # @@ -483,7 +483,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprintui_cflags gutenprintui_libs gutenprintui2_cflags gutenprintui2_libs LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH LIBOBJS LTLIBOBJS LTALLOCA' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprintui_cflags gutenprintui_libs gutenprintui2_cflags gutenprintui2_libs LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH LIBOBJS LTLIBOBJS LTALLOCA' ac_subst_files='' # Initialize some variables set by options. @@ -964,26 +964,6 @@ ac_env_FFLAGS_set=${FFLAGS+set} ac_env_FFLAGS_value=$FFLAGS ac_cv_env_FFLAGS_set=${FFLAGS+set} ac_cv_env_FFLAGS_value=$FFLAGS -ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_env_PKG_CONFIG_value=$PKG_CONFIG -ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG -ac_env_GTK2_CFLAGS_set=${GTK2_CFLAGS+set} -ac_env_GTK2_CFLAGS_value=$GTK2_CFLAGS -ac_cv_env_GTK2_CFLAGS_set=${GTK2_CFLAGS+set} -ac_cv_env_GTK2_CFLAGS_value=$GTK2_CFLAGS -ac_env_GTK2_LIBS_set=${GTK2_LIBS+set} -ac_env_GTK2_LIBS_value=$GTK2_LIBS -ac_cv_env_GTK2_LIBS_set=${GTK2_LIBS+set} -ac_cv_env_GTK2_LIBS_value=$GTK2_LIBS -ac_env_GIMP2_CFLAGS_set=${GIMP2_CFLAGS+set} -ac_env_GIMP2_CFLAGS_value=$GIMP2_CFLAGS -ac_cv_env_GIMP2_CFLAGS_set=${GIMP2_CFLAGS+set} -ac_cv_env_GIMP2_CFLAGS_value=$GIMP2_CFLAGS -ac_env_GIMP2_LIBS_set=${GIMP2_LIBS+set} -ac_env_GIMP2_LIBS_value=$GIMP2_LIBS -ac_cv_env_GIMP2_LIBS_set=${GIMP2_LIBS+set} -ac_cv_env_GIMP2_LIBS_value=$GIMP2_LIBS # # Report the --help message. @@ -1078,7 +1058,7 @@ Optional Features: (and sometimes confusing) to the casual installer --enable-cups-ppds build CUPS PPD files [(automatic)] --enable-translated-cups-ppds - build translated CUPS PPD files [no] + build translated CUPS PPD files [yes] --enable-cups-ppds-at-top-level place CUPS PPD files at top level [no] --enable-cups-level3-ppds @@ -1151,12 +1131,6 @@ Some influential environment variables: CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags - PKG_CONFIG path to pkg-config utility - GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config - GTK2_LIBS linker flags for GTK2, overriding pkg-config - GIMP2_CFLAGS - C compiler flags for GIMP2, overriding pkg-config - GIMP2_LIBS linker flags for GIMP2, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1250,7 +1224,7 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi @@ -2894,7 +2868,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2952,7 +2927,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3068,7 +3044,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3122,7 +3099,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3167,7 +3145,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3211,7 +3190,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3646,14 +3626,14 @@ bsdi4*) ;; cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh + # win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' + lt_cv_file_magic_cmd='win32_libid' ;; mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. + # win32_libid shell function, so use a weaker test based on 'objdump'. lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' lt_cv_file_magic_cmd='$OBJDUMP -f' ;; @@ -3712,10 +3692,19 @@ irix5* | irix6* | nonstopux*) # This must be Linux ELF. linux*) + case $host_cpu in + alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu | knetbsd*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -3832,7 +3821,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3835 "configure"' > conftest.$ac_ext + echo '#line 3824 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3952,7 +3941,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4261,7 +4251,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4431,7 +4422,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4498,7 +4490,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4758,7 +4751,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4816,7 +4810,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4887,7 +4882,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4931,7 +4927,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5396,7 +5393,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5399:" \ +echo "$as_me:5396:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5442,7 +5439,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5491,7 +5489,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5549,7 +5548,7 @@ if test "${lt_cv_sys_max_cmd_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else i=0 - teststring="ABCD" + testring="ABCD" case $build_os in msdosdjgpp*) @@ -5588,16 +5587,16 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && + while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ + = "XX$testring") >/dev/null 2>&1 && + new_result=`expr "X$testring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` - teststring=$teststring$teststring + testring=$testring$testring done - teststring= + testring= # Add a significant safety factor because C++ compilers can tack on massive # amounts of additional arguments before passing them to the linker. # It appears as though 1/2 is a usable value. @@ -6428,11 +6427,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6431: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6430: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6435: \$? = $ac_status" >&5 + echo "$as_me:6434: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6661,11 +6660,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6664: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6663: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6668: \$? = $ac_status" >&5 + echo "$as_me:6667: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6721,11 +6720,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6724: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6723: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6728: \$? = $ac_status" >&5 + echo "$as_me:6727: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -6898,7 +6897,7 @@ EOF fi ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -6937,7 +6936,7 @@ EOF ;; linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_cmds="$tmp_archive_cmds" supports_anon_versioning=no @@ -6956,7 +6955,6 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ else archive_expsym_cmds="$tmp_archive_cmds" fi - link_all_deplibs=no else ld_shlibs=no fi @@ -7113,7 +7111,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7173,7 +7172,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7238,7 +7238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext=".dll" # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -7416,7 +7416,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -7694,7 +7694,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -7807,7 +7807,7 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows - shrext_cmds=".dll" + shrext=".dll" need_version=no need_lib_prefix=no @@ -7872,7 +7872,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -7955,7 +7955,7 @@ hpux9* | hpux10* | hpux11*) need_version=no case "$host_cpu" in ia64*) - shrext_cmds='.so' + shrext='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -7970,7 +7970,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext_cmds='.sl' + shrext='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -7981,7 +7981,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext_cmds='.sl' + shrext='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -8052,8 +8052,8 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` + sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -8065,18 +8065,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - knetbsd*-gnu) version_type=linux need_lib_prefix=no @@ -8147,7 +8135,7 @@ openbsd*) os2*) libname_spec='$name' - shrext_cmds=".dll" + shrext=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -8376,7 +8364,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8479,7 +8468,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8544,7 +8534,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8637,7 +8628,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8702,7 +8694,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8768,7 +8761,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8834,7 +8828,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8909,7 +8904,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10140,7 +10136,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10321,7 +10318,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then @@ -10518,7 +10515,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -11073,7 +11070,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -11184,11 +11181,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11187: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11184: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11191: \$? = $ac_status" >&5 + echo "$as_me:11188: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11244,11 +11241,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11247: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11244: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11251: \$? = $ac_status" >&5 + echo "$as_me:11248: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11314,9 +11311,6 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar cygwin* | mingw*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ;; - linux*) - link_all_deplibs_CXX=no - ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -11398,7 +11392,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -11511,7 +11505,7 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows - shrext_cmds=".dll" + shrext=".dll" need_version=no need_lib_prefix=no @@ -11576,7 +11570,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -11659,7 +11653,7 @@ hpux9* | hpux10* | hpux11*) need_version=no case "$host_cpu" in ia64*) - shrext_cmds='.so' + shrext='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -11674,7 +11668,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext_cmds='.sl' + shrext='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -11685,7 +11679,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext_cmds='.sl' + shrext='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -11756,8 +11750,8 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` + sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11769,18 +11763,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - knetbsd*-gnu) version_type=linux need_lib_prefix=no @@ -11851,7 +11833,7 @@ openbsd*) os2*) libname_spec='$name' - shrext_cmds=".dll" + shrext=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -12080,7 +12062,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12183,7 +12166,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12248,7 +12232,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12341,7 +12326,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12406,7 +12392,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12472,7 +12459,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12538,7 +12526,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12613,7 +12602,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13530: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13545: \$? = $ac_status" >&5 + echo "$as_me:13534: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13598,11 +13587,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13601: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13590: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13605: \$? = $ac_status" >&5 + echo "$as_me:13594: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13775,7 +13764,7 @@ EOF fi ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -13814,7 +13803,7 @@ EOF ;; linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_cmds_F77="$tmp_archive_cmds" supports_anon_versioning=no @@ -13833,7 +13822,6 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ else archive_expsym_cmds_F77="$tmp_archive_cmds" fi - link_all_deplibs_F77=no else ld_shlibs_F77=no fi @@ -13980,7 +13968,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14030,7 +14019,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14095,7 +14085,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext=".dll" # FIXME: Setting linknames here is a bad hack. archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -14273,7 +14263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs_F77=yes ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -14551,7 +14541,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -14664,7 +14654,7 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows - shrext_cmds=".dll" + shrext=".dll" need_version=no need_lib_prefix=no @@ -14729,7 +14719,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -14812,7 +14802,7 @@ hpux9* | hpux10* | hpux11*) need_version=no case "$host_cpu" in ia64*) - shrext_cmds='.so' + shrext='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -14827,7 +14817,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext_cmds='.sl' + shrext='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -14838,7 +14828,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext_cmds='.sl' + shrext='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -14909,8 +14899,8 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` + sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -14922,18 +14912,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - knetbsd*-gnu) version_type=linux need_lib_prefix=no @@ -15004,7 +14982,7 @@ openbsd*) os2*) libname_spec='$name' - shrext_cmds=".dll" + shrext=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -15183,7 +15161,7 @@ if test -f "$ltmain"; then # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -15326,7 +15304,7 @@ DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" # Used on cygwin: assembler. -AS="$AS" +AS=$lt_AS # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -15345,7 +15323,7 @@ objext="$ac_objext" libext="$libext" # Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' +shrext='$shrext' # Executable file suffix (normally ""). exeext="$exeext" @@ -15643,11 +15621,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15646: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15624: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15650: \$? = $ac_status" >&5 + echo "$as_me:15628: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15876,11 +15854,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15879: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15857: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15883: \$? = $ac_status" >&5 + echo "$as_me:15861: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15936,11 +15914,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15939: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15917: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15943: \$? = $ac_status" >&5 + echo "$as_me:15921: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16113,7 +16091,7 @@ EOF fi ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -16152,7 +16130,7 @@ EOF ;; linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' archive_cmds_GCJ="$tmp_archive_cmds" supports_anon_versioning=no @@ -16171,7 +16149,6 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ else archive_expsym_cmds_GCJ="$tmp_archive_cmds" fi - link_all_deplibs_GCJ=no else ld_shlibs_GCJ=no fi @@ -16328,7 +16305,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16388,7 +16366,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16453,7 +16432,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext=".dll" # FIXME: Setting linknames here is a bad hack. archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -16631,7 +16610,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs_GCJ=yes ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -16909,7 +16888,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext=".so" postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -17022,7 +17001,7 @@ bsdi4*) cygwin* | mingw* | pw32*) version_type=windows - shrext_cmds=".dll" + shrext=".dll" need_version=no need_lib_prefix=no @@ -17087,7 +17066,7 @@ darwin* | rhapsody*) soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` @@ -17170,7 +17149,7 @@ hpux9* | hpux10* | hpux11*) need_version=no case "$host_cpu" in ia64*) - shrext_cmds='.so' + shrext='.so' hardcode_into_libs=yes dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH @@ -17185,7 +17164,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) - shrext_cmds='.sl' + shrext='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH @@ -17196,7 +17175,7 @@ hpux9* | hpux10* | hpux11*) sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - shrext_cmds='.sl' + shrext='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH @@ -17267,8 +17246,8 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` + sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17280,18 +17259,6 @@ linux*) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - knetbsd*-gnu) version_type=linux need_lib_prefix=no @@ -17362,7 +17329,7 @@ openbsd*) os2*) libname_spec='$name' - shrext_cmds=".dll" + shrext=".dll" need_lib_prefix=no library_names_spec='$libname${shared_ext} $libname.a' dynamic_linker='OS/2 ld.exe' @@ -17591,7 +17558,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17694,7 +17662,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17759,7 +17728,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17852,7 +17822,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17917,7 +17888,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17983,7 +17955,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18049,7 +18022,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18124,7 +18098,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 @@ -19434,13 +19409,13 @@ echo "$as_me: error: bad value ${enableval} for --enable-translated-cups-ppds" > esac else if test -z "${BUILD_TRANSLATED_CUPS_PPDS}" ; then - BUILD_TRANSLATED_CUPS_PPDS="no" + BUILD_TRANSLATED_CUPS_PPDS="yes" fi echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5 echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6 ; fi; if test -z "${BUILD_TRANSLATED_CUPS_PPDS}" ; then - BUILD_TRANSLATED_CUPS_PPDS="no" + BUILD_TRANSLATED_CUPS_PPDS="yes" fi @@ -20254,7 +20229,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20426,11 +20402,11 @@ else fi + succeeded=no -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then @@ -20455,6 +20431,7 @@ do done done + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -20468,19 +20445,77 @@ else echo "${ECHO_T}no" >&6 fi -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for gtk+-2.0" >&5 +echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "gtk+-2.0" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking GTK2_CFLAGS" >&5 +echo $ECHO_N "checking GTK2_CFLAGS... $ECHO_C" >&6 + GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` + echo "$as_me:$LINENO: result: $GTK2_CFLAGS" >&5 +echo "${ECHO_T}$GTK2_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking GTK2_LIBS" >&5 +echo $ECHO_N "checking GTK2_LIBS... $ECHO_C" >&6 + GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` + echo "$as_me:$LINENO: result: $GTK2_LIBS" >&5 +echo "${ECHO_T}$GTK2_LIBS" >&6 + else + GTK2_CFLAGS="" + GTK2_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_GTK2=yes + BUILD_LIBGUTENPRINTUI2=yes + GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} ${GTK2_LIBS}" + else + HAVE_GTK2=no + BUILD_LIBGUTENPRINTUI2=no + fi + +# Require both gimptool and pkg-config to succeed +if test x$BUILD_GIMP2 = xyes; then + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $ac_pt_PKG_CONFIG in + case $PKG_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -20490,146 +20525,79 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - PKG_CONFIG=$ac_pt_PKG_CONFIG -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - PKG_CONFIG="" - fi - -fi + fi -pkg_failed=no -echo "$as_me:$LINENO: checking for GTK2" >&5 -echo $ECHO_N "checking for GTK2... $ECHO_C" >&6 + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for gimpui-2.0" >&5 +echo $ECHO_N "checking for gimpui-2.0... $ECHO_C" >&6 -if test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null` -else - pkg_failed=yes -fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null` -else - pkg_failed=yes -fi -else - pkg_failed=untried -fi + if $PKG_CONFIG --exists "gimpui-2.0" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking GIMP2_CFLAGS" >&5 +echo $ECHO_N "checking GIMP2_CFLAGS... $ECHO_C" >&6 + GIMP2_CFLAGS=`$PKG_CONFIG --cflags "gimpui-2.0"` + echo "$as_me:$LINENO: result: $GIMP2_CFLAGS" >&5 +echo "${ECHO_T}$GIMP2_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking GIMP2_LIBS" >&5 +echo $ECHO_N "checking GIMP2_LIBS... $ECHO_C" >&6 + GIMP2_LIBS=`$PKG_CONFIG --libs "gimpui-2.0"` + echo "$as_me:$LINENO: result: $GIMP2_LIBS" >&5 +echo "${ECHO_T}$GIMP2_LIBS" >&6 + else + GIMP2_CFLAGS="" + GIMP2_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + GIMP2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gimpui-2.0"` -if test $pkg_failed = yes; then - GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"` - # Put the nasty error message in config.log where it belongs - echo "$GTK2_PKG_ERRORS" 1>&5 + fi - HAVE_GTK2=no - BUILD_LIBGUTENPRINTUI2=no -elif test $pkg_failed = untried; then - HAVE_GTK2=no - BUILD_LIBGUTENPRINTUI2=no -else - GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS - GTK2_LIBS=$pkg_cv_GTK2_LIBS - HAVE_GTK2=yes - BUILD_LIBGUTENPRINTUI2=yes - GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} ${GTK2_LIBS}" -fi -# Require both gimptool and pkg-config to succeed -if test x$BUILD_GIMP2 = xyes; then -pkg_failed=no -echo "$as_me:$LINENO: checking for GIMP2" >&5 -echo $ECHO_N "checking for GIMP2... $ECHO_C" >&6 -if test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gimpui-2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GIMP2_CFLAGS=`$PKG_CONFIG --cflags "gimpui-2.0" 2>/dev/null` -else - pkg_failed=yes -fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gimpui-2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GIMP2_LIBS=`$PKG_CONFIG --libs "gimpui-2.0" 2>/dev/null` -else - pkg_failed=yes -fi -else - pkg_failed=untried -fi + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi -if test $pkg_failed = yes; then - GIMP2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gimpui-2.0"` - # Put the nasty error message in config.log where it belongs - echo "$GIMP2_PKG_ERRORS" 1>&5 + if test $succeeded = yes; then + BUILD_GIMP2=yes + else + BUILD_GIMP2=no + fi - BUILD_GIMP2=no -elif test $pkg_failed = untried; then - BUILD_GIMP2=no -else - GIMP2_CFLAGS=$pkg_cv_GIMP2_CFLAGS - GIMP2_LIBS=$pkg_cv_GIMP2_LIBS - BUILD_GIMP2=yes -fi fi # create custom command-line --with option @@ -20931,7 +20899,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20985,7 +20954,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21424,7 +21394,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21482,7 +21453,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21598,7 +21570,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21652,7 +21625,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21697,7 +21671,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21741,7 +21716,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22256,7 +22232,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22314,7 +22291,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22430,7 +22408,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22484,7 +22463,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22529,7 +22509,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22573,7 +22554,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22895,7 +22877,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22961,7 +22944,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23050,7 +23034,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24512,7 +24497,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24603,7 +24589,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -24653,7 +24640,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25119,7 +25107,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25173,7 +25162,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25394,7 +25384,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25454,7 +25445,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25514,7 +25506,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25573,7 +25566,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25634,7 +25628,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25706,7 +25701,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25784,7 +25780,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25862,7 +25859,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25940,7 +25938,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26025,7 +26024,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26115,7 +26115,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26183,7 +26184,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26251,7 +26253,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26320,7 +26323,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26388,7 +26392,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26510,7 +26515,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26580,7 +26586,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26643,7 +26650,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26796,7 +26804,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26873,7 +26882,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -26945,7 +26955,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27254,7 +27265,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27573,7 +27585,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27887,7 +27900,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28222,7 +28236,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28336,7 +28351,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28502,7 +28518,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28647,7 +28664,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28804,7 +28822,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28953,7 +28972,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29102,7 +29122,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29251,7 +29272,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29400,7 +29422,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29551,7 +29574,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29701,7 +29725,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29850,7 +29875,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -29999,7 +30025,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30190,7 +30217,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30250,7 +30278,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30323,7 +30352,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30388,7 +30418,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30460,7 +30491,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30561,7 +30593,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30658,7 +30691,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -31077,7 +31111,7 @@ cat >>confdefs.h <<_ACEOF #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL} _ACEOF -RELEASE_DATE="30 Jun 2005" +RELEASE_DATE="15 Jul 2005" cat >>confdefs.h <<_ACEOF #define RELEASE_DATE "${RELEASE_DATE}" @@ -32172,7 +32206,6 @@ s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t s,@GTK_LIBS@,$GTK_LIBS,;t t s,@GIMPTOOL2_CHECK@,$GIMPTOOL2_CHECK,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@GTK2_CFLAGS@,$GTK2_CFLAGS,;t t s,@GTK2_LIBS@,$GTK2_LIBS,;t t s,@GIMP2_CFLAGS@,$GIMP2_CFLAGS,;t t @@ -32463,6 +32496,11 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -32501,12 +32539,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;} fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub diff --git a/configure.ac b/configure.ac index f79b59b..465b277 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl $Id: configure.ac,v 1.127 2005/07/01 22:48:27 rleigh Exp $ +dnl $Id: configure.ac,v 1.128 2005/07/15 00:31:54 rlk Exp $ dnl Copyright (C) 2001-2004 Roger Leigh dnl dnl This program is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ pushdef([GUTENPRINT_VERSION], GUTENPRINT_MAJOR_VERSION.GUTENPRINT_MINOR_VERSION. AC_INIT(GUTENPRINT_NAME, GUTENPRINT_VERSION, [gimp-print-devel@lists.sourceforge.net]) AC_PREREQ(2.53) -AC_REVISION($Revision: 1.127 $) +AC_REVISION($Revision: 1.128 $) AC_CONFIG_SRCDIR(src/main/print-vars.c) AC_CONFIG_AUX_DIR(scripts) STP_INIT @@ -215,6 +215,7 @@ STP_ARG_WITH_DETAILED( ]) BUILD_CUPS_PPDS="${BUILD_CUPS}" +BUILD_TRANSLATED_CUPS_PPDS="${BUILD_CUPS}" STP_ARG_ENABLE([cups-ppds], [build CUPS PPD files], @@ -224,7 +225,7 @@ STP_ARG_ENABLE([cups-ppds], STP_ARG_ENABLE([translated-cups-ppds], [build translated CUPS PPD files], [BUILD_TRANSLATED_CUPS_PPDS], - [no]) + [yes]) USE_LEVEL3_PS=no if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then @@ -233,6 +234,7 @@ dnl Quote to protect sed regexes [cups_major=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'`] [cups_minor=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`] [cups_point=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\3/'`] +dnl There was no CUPS 1.0.15 or the like if test "$cups_major" -gt 1 -o "$cups_minor" -gt 1 -o "$cups_point" -gt 14 ; then USE_LEVEL3_PS=yes fi diff --git a/doc/Makefile.in b/doc/Makefile.in index 4d3a468..3acbdc8 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -262,7 +262,6 @@ 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@ diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in index 6674208..13fa2cb 100644 --- a/doc/developer/Makefile.in +++ b/doc/developer/Makefile.in @@ -252,7 +252,6 @@ 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@ diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf index ec324b0..e8ed737 100644 Binary files a/doc/developer/gutenprint.pdf and b/doc/developer/gutenprint.pdf differ diff --git a/doc/developer/reference-html/HTML.manifest b/doc/developer/reference-html/HTML.manifest new file mode 100644 index 0000000..731655e --- /dev/null +++ b/doc/developer/reference-html/HTML.manifest @@ -0,0 +1,18 @@ +book1.html +f14.html +c39.html +c48.html +x67.html +x79.html +c194.html +c200.html +x271.html +c464.html +x955.html +x1669.html +c1717.html +x1734.html +c1968.html +gpl.html +gpl-terms.html +ln10.html diff --git a/doc/developer/reference-html/a2122.html b/doc/developer/reference-html/a2122.html deleted file mode 100644 index df22a8b..0000000 --- a/doc/developer/reference-html/a2122.html +++ /dev/null @@ -1,220 +0,0 @@ - -GNU General Public License
The Developer's Guide to Gutenprint
PrevNext

Appendix A. GNU General Public License

A.1. Preamble

The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General - Public License is intended to guarantee your freedom to share - and change free software - to make sure the software is free for - all its users. This General Public License applies to most of - the Free Software Foundation's software and to any other program - whose authors commit to using it. (Some other Free Software - Foundation software is covered by the GNU Library General Public - License instead.) You can apply it to your programs, too. -

When we speak of free software, we are referring to freedom, not - price. Our General Public Licenses are designed to make sure - that you have the freedom to distribute copies of free software - (and charge for this service if you wish), that you receive - source code or can get it if you want it, that you can change - the software or use pieces of it in new free programs; and that - you know you can do these things. -

To protect your rights, we need to make restrictions that forbid - anyone to deny you these rights or to ask you to surrender the - rights. These restrictions translate to certain responsibilities - for you if you distribute copies of the software, or if you - modify it. -

For example, if you distribute copies of such a program, whether - gratis or for a fee, you must give the recipients all the rights - that you have. You must make sure that they, too, receive or can - get the source code. And you must show them these terms so they - know their rights. -

We protect your rights with two steps: - -

  1. copyright the software, and -

  2. offer you this license which gives you legal permission to - copy, distribute and/or modify the software. -

-

Also, for each author's protection and ours, we want to make - certain that everyone understands that there is no warranty for - this free software. If the software is modified by someone else - and passed on, we want its recipients to know that what they - have is not the original, so that any problems introduced by - others will not reflect on the original authors' reputations. -

Finally, any free program is threatened constantly by software - patents. We wish to avoid the danger that redistributors of a - free program will individually obtain patent licenses, in effect - making the program proprietary. To prevent this, we have made it - clear that any patent must be licensed for everyone's free use - or not licensed at all. -

The precise terms and conditions for copying, distribution and - modification follow. -

PrevHomeNext
Dithering TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
\ No newline at end of file diff --git a/doc/developer/reference-html/book1.html b/doc/developer/reference-html/book1.html new file mode 100644 index 0000000..34715a9 --- /dev/null +++ b/doc/developer/reference-html/book1.html @@ -0,0 +1,453 @@ + +The Developer's Guide to Gutenprint

The Developer's Guide to Gutenprint

The Gutenprint Project +

Copyright © 2003 The Gutenprint Project

  Next
  Preface
\ No newline at end of file diff --git a/doc/developer/reference-html/c1717.html b/doc/developer/reference-html/c1717.html index 8e09502..0d98cde 100644 --- a/doc/developer/reference-html/c1717.html +++ b/doc/developer/reference-html/c1717.html @@ -1,27 +1,24 @@ - + Weaving for inkjet printers
Chapter 6. Weaving for inkjet printers

6.1. IntroductionIntroduction

The Epson Stylus Color/Photo printers don't have memory to print using all of the nozzles in the print head. For example, the Stylus Photo 700/EX has 32 nozzles. At 720 dpi, with an 8" wide - image, a single line requires ((8 × 720 × 6) / 8) + image, a single line requires ((8 × 720 × 6) / 8) bytes, or 4320 bytes (because the Stylus Photo printers have 6 ink colors). To use 32 nozzles per color would require 138240 bytes. It's actually worse than that, though, because the @@ -99,12 +115,12 @@ NAME="AEN1719" >

With the newer (740/750 and later) printers it's even worse, since these printers support multiple dot sizes; of course, the - even newer 2880×720 printers don't help either. + even newer 2880×720 printers don't help either.

Older Epson printers had a mode called MicroWeave™â„¢. In this mode, the host fed the printer individual rows of dots, and the printer bundled them up and sent them to the print head in the correct @@ -112,7 +128,7 @@ NAME="AEN1719" in new printers, but in some cases the implementation is very minimal: the printer uses exactly one nozzle of each color (the first one). This makes printing extremely slow (more than 30 - minutes for one 8.5×11" page), although the quality is + minutes for one 8.5×11" page), although the quality is extremely high with no visible banding whatsoever. It's not good for the print head, though, since no ink is flowing through the other nozzles. This leads to drying of ink and possible @@ -155,11 +171,11 @@ NAME="AEN1719" >

Interestingly, apparently the Windows (and presumably Macintosh) drivers for most or all Epson printers still list a - “microweave” mode. Experiments have demonstrated - that this does not in fact use the “microweave” mode + “microweave†mode. Experiments have demonstrated + that this does not in fact use the “microweave†mode of the printer. Possibly it does nothing, or it uses a different weave pattern from what the - “non-microweave” mode does. This is unnecessarily + “non-microweave†mode does. This is unnecessarily confusing, at least for people who write drivers who try to explain them to people who don't.

Home + Reporting Bugs
Home +Dithering
Next
dither_fastblackdither_fastblack

dither_blackdither_black

dither_cmykdither_cmyk

There is a choice of dithering algorithms. Four of them are based on a basic error diffusion, with a few tweaks of my own. - The other one is ‘ordered’. However, they all share + The other one is ‘ordered’. However, they all share the basic operation in common. First, the algorithm picks what kind of dot (if there are multiple dot sizes and/or tones that may be picked) is the candidate to be printed. This decision is @@ -186,7 +183,7 @@ CLASS="literal"

Error diffusion works by taking the output error at a given - pixel and “diffusing” it into surrounding pixels. + pixel and “diffusing†it into surrounding pixels. Output error is the difference between the amount of ink output and the input level at each pixel. For simple printers, with one or four ink colors and only one dot size, the amount of ink @@ -208,7 +205,7 @@ CLASS="literal"

There are two sub-classes of error diffusion that we use here, - ‘random’ and ‘hybrid’. One of the + ‘random’ and ‘hybrid’. One of the techniques that we use to ameliorate the artifacts is to use a fuzzy threshold rather than the hard threshold of half of the output level. Random error diffusion uses a pseudo-random @@ -219,7 +216,7 @@ CLASS="literal"

There is one additional variant (on both sub-classes), called - ‘adaptive hybrid’ and ‘adaptive random’. + ‘adaptive hybrid’ and ‘adaptive random’. The adaptive variant takes advantage of the fact that the patterns that ordered dithering create are less visible at very low densities, while the artifacts created by error diffusion @@ -240,7 +237,7 @@ CLASS="literal" > The next question: how do we handle black when printing in color? Black ink is much darker than colored inks. It's possible to produce black by adding some mixture of cyan, - magenta, and yellow—in principle. In practice, the black + magenta, and yellow—in principle. In practice, the black really isn't very black, and different inks and different papers will produce different color casts. However, by using CMY to produce gray, we can output a lot more dots! This makes for a @@ -325,7 +322,7 @@ TYPE="1" >

  • Compute the “virtual value”. The virtual value +> Compute the “virtual valueâ€. The virtual value is the distance between the value of the lighter and the value of the darker ink. So if the value of the light ink is 32768 and the dark ink is 65536, we compute a virtual @@ -366,7 +363,7 @@ HREF="mailto:ttonino@bio.vu.nl" requires careful selection of initial points to achieve good results, and is very time consuming. For best results, a different matrix must be used for modes with 2:1 aspect ratio - (e.g. 1440×720) than for 1:1 (e. g. 720×720). It is + (e.g. 1440×720) than for 1:1 (e. g. 720×720). It is essential with any of these matrices that every point be used. Skipping points generates low-frequency noise.

  • Oversampling. This is how to print 1440×720 with Epson - Stylus printers. Printing full density at 1440×720 will +> Oversampling. This is how to print 1440×720 with Epson + Stylus printers. Printing full density at 1440×720 will result in excess ink being laid down. The trick is to print only every other dot. We still compute the error as though we printed every dot. It turns out that randomizing which dots are printed results in very speckled output. This can be - taken too far; oversampling at 1440×1440 or - 1440×2880 virtual resolution results in other problems. - However, at present 1440×1440 (which is more accurately - called "1440×720 enhanced", as the Epson printers cannot + taken too far; oversampling at 1440×1440 or + 1440×2880 virtual resolution results in other problems. + However, at present 1440×1440 (which is more accurately + called "1440×720 enhanced", as the Epson printers cannot print 1440 rows per inch) does quite well, although it's slow.

    • dither_set_X_ranges_simple - (X = X = cc, - m, m, yy or - kk) describes the ink choices available for each color. This is useful in typical cases where a four color printer with variable dot sizes is in use. It is @@ -864,23 +861,23 @@ CLASS="function" CLASS="function" >dither_set_X_ranges - (X = X = cc, - m, m, yy or - kk) describes in a more general way the ink choices available for each color. For each possible ink choice, a bit pattern, dot size, value (i. e. relative @@ -915,7 +912,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" >HomeNext + Adding a new printer
    Chapter 4. Adding a new printer

    This chapter covers adding a new ESCP/2, PCL, or Canon printer. Writing a new driver module is not covered. @@ -131,7 +150,7 @@ CLASS="sect1" CLASS="sect1" >4.1. printers.xml

    <printer name="EPSON Stylus Color 1500" driver="escp2-1500">
@@ -163,30 +188,33 @@ CLASS="programlisting"
 <gamma value="0.597"/>
 <density value="1.0"/>
 </printer>

    There are other tags that may be present. The only ones that - are mandatory are <printer><printer>, - <color><color> and - <model><model>. The other optional parameters - (<gamma><gamma> and - <density><density> in this case) can be used to adjust control settings. This is probably not the right place for them; the printer drivers themselves should contain this @@ -213,75 +241,75 @@ CLASS="variablelist" >

    <family><family>

    This defines what driver module this printer uses. The - attribute namename is the name of the family driver to associate the printers with, for example - escp2, escp2, pclpcl, - canon, canon, psps or - rawraw. This tag may only contain - <printer><printer> elements.

    <printer><printer>

    This starts the definition of a printer. It must contain - the attributes namename and - driver. driver. namename should be is the full name of the printer, and must be human - readable. driverdriver should consist of alphanumerics and hyphens, and be fairly short. - namename is what will appear in the user-visible listing of printers, and may be translated - into the user's language, while driverdriver is what is actually used to key into the list of printers. It is legal to have multiple printers with the same driver @@ -289,43 +317,43 @@ CLASS="literal"

    <color><color>

    This tag may not contain any content, but the - valuevalue attribute may be set to - true or true or falsefalse. This indicates that this printer is capable of color, or is not capable of color respectively.

    <model><model>

    This defines a model number. This tag may not contain any - content, but the valuevalue attribute may be set to a positive integer. This is passed into the driver, which may do whatever it cares to with - it—index into a table, compute on, or whatever. + it—index into a table, compute on, or whatever. This need not be unique.

    Home + Copying, modification and redistribution

    Gutenprint is licensed under the terms of the GNU General Public License (GPL), reproduced in Appendix A.

    Home +ESC/P2
    Chapter 5. ESC/P2

    This is a description of the ESC/P2 raster commands used by the Gutenprint printer driver, which is a subset of the complete @@ -93,29 +114,29 @@ CLASS="emphasis" are certainly not complete.

    All ESCP/2 raster commands begin with the All ESCP/2 raster commands begin with the ESCESC character (0x1b), followed by either one or two command characters and arguments where applicable. Older commands generally have one command character. Newer commands usually have a - ‘(’ (left parenthesis) followed by +>(’ (left parenthesis) followed by a command character and a byte count for the arguments that follow. The byte count is a 16-bit (2 byte) binary integer, in little endian order.

    All arguments listed here are of the form - name[bytes] where name[bytes] where [bytes][bytes] is the number of bytes that comprise the argument. The arguments themselves are usually one, two, or four byte integers, always @@ -133,7 +154,7 @@ CLASS="sect1" CLASS="sect1" >5.1. Standard commandsStandard commands

    ESC @ESC @

    ESC (G ESC (G BCBC=1 - ON1ON1

    Turn on graphics mode. Turn on graphics mode. ONON should be

    ESC (U ESC (U BCBC=1 - UNIT1UNIT1

    Set basic unit of measurement used by printer. This is expressed in multiples of 1/3600". At 720 DPI, - UNITUNIT is 5; at - 360 DPI, UNITUNIT is

    ESC (U ESC (U BCBC=5 - PAGEUNITS1 PAGEUNITS1 VUNIT1VUNIT1 - HUNIT1HUNIT1 - BASEUNIT2BASEUNIT2

    Set basic units of measurement used by the printer. - PAGEUNITPAGEUNIT is the unit of page measurement (for commands that set page dimensions and - the like). VUNITVUNIT is the unit of vertical measurement (for vertical movement commands). - HUNITHUNIT is the unit of horizontal movement (for horizontal positioning commands). All of these units are expressed in - BASEUNITBASEUNIT, which is in reciprocal - inches. Typically, BASEUNITBASEUNIT is 1440. In 720 DPI mode, - PAGEUNIT, PAGEUNIT, VUNITVUNIT, - and HUNITHUNIT are all 2; in 1440×720 DPI mode, - ; in 1440×720 DPI mode, + PAGEUNIT and PAGEUNIT and VUNITVUNIT are normally set to 2; - HUNITHUNIT is set to

    ESC (K ESC (K BCBC=2 - ZERO1ZERO1 - GRAYMODE1GRAYMODE1

    GRAYMODEGRAYMODE should be 1 for grayscale. - ZEROZERO should always be

    ESC (i ESC (i BCBC=1 - MICROWEAVE1MICROWEAVE1

    If If MICROWEAVEMICROWEAVE is

    “Full-overlap” +> “Full-overlapâ€

    “Four-pass” +> “Four-passâ€

    “Full-overlap 2” +> “Full-overlap 2â€

    ESC U - DIRECTION1DIRECTION1

    If If DIRECTIONDIRECTION is

    ESC (s ESC (s BCBC=1 - SPEED1SPEED1

    On some older printers, this controls the print head - speed. SPEEDSPEED of 2 is 10 inches/sec; - SPEEDSPEED of 0

    ESC (e ESC (e BCBC=2 - ZERO1ZERO1 - DOTSIZE1DOTSIZE1

    Choose print dotsize. Choose print dotsize. DOTSIZEDOTSIZE can take on various values, depending upon the printer. Almost all printers support 2. Variable dot size printers - allow a value of 1616. Other than the - value of 1616, this appears to be ignored at resolutions of 720 DPI and above.

    ESC (C ESC (C BCBC=2 - PAGELENGTH2, PAGELENGTH2, ESC (C ESC (C BCBC=4 - PAGELENGTH4PAGELENGTH4

    Set the length of the page in “pageunits” - (see Set the length of the page in “pageunits†+ (see ESC (UESC (U above). The second form of the command allows setting of longer page lengths on new printers (these happen to be the printers that @@ -563,41 +584,41 @@ CLASS="literal"

    ESC (c ESC (c BCBC=4 - TOP2TOP2 - LENGTH2, LENGTH2, ESC (c ESC (c BCBC=8 - TOP4TOP4 - LENGTH4LENGTH4

    Set the vertical page margins of the page in - “pageunits” (see ESC (UESC (U above). The margins are specified as the top of the page and the length of the page. The second form of the @@ -607,119 +628,119 @@ CLASS="literal"

    ESC (S ESC (S BCBC=8 - WIDTH4WIDTH4 - LENGTH4LENGTH4

    Set the width and length of the printed page region in - “pageunits” (see ESC (UESC (U above).

    ESC (v ESC (v BCBC=2 - ADVANCE2, ADVANCE2, ESC (v ESC (v BCBC=4 - ADVANCE4ADVANCE4

    Feed vertically Feed vertically ADVANCEADVANCE - “vertical units” (see ESC - (U above) from the current print head position.

    ESC (V ESC (V BCBC=2 - ADVANCE2, ADVANCE2, ESC (V ESC (V BCBC=4 - ADVANCE4ADVANCE4

    Feed vertically Feed vertically ADVANCEADVANCE - “vertical units” (see ESC - (U above) from the top margin.

    ESC ($ ESC ($ BCBC=4 - OFFSET4OFFSET4

    Set horizontal position to Set horizontal position to OFFSETOFFSET from the left margin. This command operates on printers of the 740 class and newer (all printers with variable @@ -727,19 +748,19 @@ CLASS="varname"

    ESC $ - OFFSET2OFFSET2

    Set horizontal position to Set horizontal position to OFFSETOFFSET from the left margin. This command operates on printers of the 740 class and newer (all printers with variable @@ -747,34 +768,34 @@ CLASS="varname"

    ESC (\ ESC (\ BCBC=4 - UNITS2UNITS2 - OFFSET2OFFSET2

    Set horizontal position to Set horizontal position to OFFSETOFFSET from the previous print head position, measured in - UNITS. UNITS. UNITSUNITS is measured in inverse inches, and should be set to 1440 in all cases. This operates on all 1440 dpi printers that @@ -782,58 +803,58 @@ CLASS="varname"

    ESC (/ ESC (/ BCBC=4 - OFFSET4OFFSET4

    Set horizontal position to Set horizontal position to OFFSETOFFSET from the previous print head position, measured in - “horizontal units” (see ESC - (U above). This operates on all variable dot size printers.

    ESC \ - OFFSET2OFFSET2

    Set horizontal position to Set horizontal position to OFFSETOFFSET from the previous print head position, measured in basic - unit of measurement (see ESC (UESC (U above). This is used on all 720 dpi printers, and can also be used on 1440 dpi printers in lower resolutions to save a few bytes. Note that - OFFSETOFFSET may be negative. The range of values for this command is between

    ESC r - COLOR1, COLOR1, ESC (r ESC (r BCBC=2 - DENSITY1DENSITY1 - COLOR1COLOR1

    Set the ink color. The first form is used on four-color printers; the second on six-color printers. - DENSITYDENSITY is 01 for light. - COLORCOLOR is

    ESC . ESC . COMPRESS1COMPRESS1 - VSEP1 VSEP1 HSEP1HSEP1 - LINES1 LINES1 WIDTH2WIDTH2 - data...

    Print data. Print data. COMPRESSCOMPRESS signifies the compression mode.

    COLORCOLORColor name
    COMPRESSCOMPRESSCompression mode TIFF compression (incorrectly documented as - “run length encoded”) + “run length encodedâ€)

    VSEPVSEP depends upon resolution and printer type. At 360 DPI, it is always 40 (8 × 5}). On some other +> (8 × 5}). On some other printers, it varies.

    HSEP1HSEP1 is 10

    LINESLINES is the number of lines to be printed. It should be

    WIDTHWIDTH is the number of pixels to be printed in each row. Following this command, a carriage return (13 decimal, - 0A0A hex) should be output to return the print head position to the left margin.

    ESC i ESC i COLOR1COLOR1 - COMPRESS1 COMPRESS1 BITS1BITS1 - BYTES2 BYTES2 LINES2LINES2 - data...

    Print data in the newer printers (that support variable dot size), and Stylus Pro models. - COLORCOLOR is the color.

    COLORCOLORColor name16Gray (“light black”)Gray (“light blackâ€)

    COMPRESSCOMPRESS signifies the compression mode:

    COMPRESSCOMPRESSCompression mode TIFF compression (incorrectly documented as - “run length encoded”) + “run length encodedâ€) TIFF compression with a special command set, or - “run length encoding 2” on some + “run length encoding 2†on some printers.

    BITSBITS is the number of bits per pixel.

    BYTESBYTES is the number of bytes wide for - each row (ceiling(BITS × width_of_row, 8)}). Note - that this is different from the ESC .ESC . command above.

    LINESLINES is the number of lines to be printed. This command is the only way to get variable dot size printing. In variable dot mode, the size of @@ -1416,23 +1437,23 @@ CLASS="constant"

    ESC (D ESC (D BCBC=4 - BASE2 BASE2 VERTICAL1VERTICAL1 - HORIZONTAL1HORIZONTAL1

    BASEBASE is the base unit for this command; it must be .

    VERTICALVERTICAL is the distance in these units between printed rows; it should be - ((separation_in_nozzles × BASEBASE - ÷ 720). + ÷ 720).

    HORIZONTALHORIZONTAL is the horizontal separation between dots in a row. Depending upon the - printer, this should be either (14400 ÷ 720) or - (14400 ÷ 360). The Stylus Pro 9000 manual + printer, this should be either (14400 ÷ 720) or + (14400 ÷ 360). The Stylus Pro 9000 manual suggests that the settings should match the chosen resolution, but that is apparently not the case (or not always the case) on other printers.

    ESC (R ESC (R BCBC=8 00 R E M O T E - 1

    Enters “remote mode”. This is a special, +> Enters “remote modeâ€. This is a special, undocumented command set that is used to set up various printer options, such as paper feed tray, and perform utility functions such as head cleaning and alignment. @@ -1497,9 +1518,9 @@ CLASS="varname"

    ESC 01 @EJL [sp] ID\r\nESC 01 @EJL [sp] ID\r\n

    @EJL ID\r
@@ -1523,6 +1550,9 @@ MDL:[printer model];
 CLS:PRINTER;
 DES:EPSON [printer model];
 \f

    ESC 01@EJL[space]1284.4[newline]@EJL[space][space][space][space]
 [space][newline]ESC@

    magic command
@@ -1582,6 +1627,9 @@ ESC (c
 ESC (S
 ESC (D (if needed)
 ESC (V (optional -- this can be accomplished with ESC (v)

    ESC (v

    ESC ($ or ESC (\ or ESC \
 ESC (r or ESC r (if needed---not used with "ESC i" and not needed if the color
 has not changed from the previous printed line)
 ESC . or ESC i  ...data... [return] (0A hex)

    [formfeed] (0C hex)
 ESC @

    Home + Using libgutenprint
    Chapter 2. Using libgutenprint

    This chapter describes how to write programs that use libgutenprint. @@ -82,7 +103,7 @@ CLASS="sect1" CLASS="sect1" >2.1. Code prerequisitesCode prerequisites

    To use libgutenprint with a program, several steps must be taken: @@ -100,9 +121,18 @@ CLASS="informalexample" >

    <gimp-print/gimp-print.h>

    #include <gimp-print/gimp-print.h>
@@ -145,6 +181,9 @@ main (int argc, char *argv[])
   return 0;
 }

    Home + Preface
    Prev

    We hope you enjoy using Gutenprint!
    -—The Gutenprint project
    +—The Gutenprint project
        

    PrevHome +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
    The Developer's Guide to Gutenprint
    PrevAppendix A. GNU General Public License 

    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

    Section 0

    This License applies to any program or other work which + contains a notice placed by the copyright holder saying it may + be distributed under the terms of this General Public + License. The "Program", below, refers to any such program or + work, and a "work based on the Program" means + either the Program or any derivative work under copyright law: + that is to say, a work containing the Program or a portion of + it, either verbatim or with modifications and/or translated + into another language. (Hereinafter, translation is included + without limitation in the term "modification".) + Each licensee is addressed as "you". +

    Activities other than copying, distribution and modification + are not covered by this License; they are outside its + scope. The act of running the Program is not restricted, and + the output from the Program is covered only if its contents + constitute a work based on the Program (independent of having + been made by running the Program). Whether that is true + depends on what the Program does. +

    Section 1

    You may copy and distribute verbatim copies of the Program's + source code as you receive it, in any medium, provided that + you conspicuously and appropriately publish on each copy an + appropriate copyright notice and disclaimer of warranty; keep + intact all the notices that refer to this License and to the + absence of any warranty; and give any other recipients of the + Program a copy of this License along with the Program. +

    You may charge a fee for the physical act of transferring a + copy, and you may at your option offer warranty protection in + exchange for a fee. +

    Section 2

    You may modify your copy or copies of the Program or any + portion of it, thus forming a work based on the Program, and + copy and distribute such modifications or work under the terms + of Section 1 above, provided + that you also meet all of these conditions: + +

    1. You must cause the modified files to carry prominent + notices stating that you changed the files and the date + of any change. +

    2. You must cause any work that you distribute or publish, + that in whole or in part contains or is derived from the + Program or any part thereof, to be licensed as a whole + at no charge to all third parties under the terms of + this License. +

    3. If the modified program normally reads commands + interactively when run, you must cause it, when started + running for such interactive use in the most ordinary + way, to print or display an announcement including an + appropriate copyright notice and a notice that there is + no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program + under these conditions, and telling the user how to view + a copy of this License. + +

      Exception:: + If the Program itself is interactive but does not + normally print such an announcement, your work based + on the Program is not required to print an + announcement.) +

      + +

    +

    These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the + Program, and can be reasonably considered independent and + separate works in themselves, then this License, and its + terms, do not apply to those sections when you distribute them + as separate works. But when you distribute the same sections + as part of a whole which is a work based on the Program, the + distribution of the whole must be on the terms of this + License, whose permissions for other licensees extend to the + entire whole, and thus to each and every part regardless of + who wrote it. +

    Thus, it is not the intent of this section to claim rights or + contest your rights to work written entirely by you; rather, + the intent is to exercise the right to control the + distribution of derivative or collective works based on the + Program. +

    In addition, mere aggregation of another work not based on the + Program with the Program (or with a work based on the Program) + on a volume of a storage or distribution medium does not bring + the other work under the scope of this License. +

    Section 3

    You may copy and distribute the Program (or a work based on + it, under Section 2 in object + code or executable form under the terms of Sections 1 and 2 above provided that you also do + one of the following: + +

    1. Accompany it with the complete corresponding + machine-readable source code, which must be distributed + under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, +

    2. Accompany it with a written offer, valid for at least + three years, to give any third party, for a charge no + more than your cost of physically performing source + distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the + terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, +

    3. Accompany it with the information you received as to the + offer to distribute corresponding source code. (This + alternative is allowed only for noncommercial + distribution and only if you received the program in + object code or executable form with such an offer, in + accord with Subsection b above.) +

    +

    The source code for a work means the preferred form of the + work for making modifications to it. For an executable work, + complete source code means all the source code for all modules + it contains, plus any associated interface definition files, + plus the scripts used to control compilation and installation + of the executable. However, as a special exception, the source + code distributed need not include anything that is normally + distributed (in either source or binary form) with the major + components (compiler, kernel, and so on) of the operating + system on which the executable runs, unless that component + itself accompanies the executable. +

    If distribution of executable or object code is made by + offering access to copy from a designated place, then offering + equivalent access to copy the source code from the same place + counts as distribution of the source code, even though third + parties are not compelled to copy the source along with the + object code. +

    Section 4

    You may not copy, modify, sublicense, or distribute the + Program except as expressly provided under this License. Any + attempt otherwise to copy, modify, sublicense or distribute + the Program is void, and will automatically terminate your + rights under this License. However, parties who have received + copies, or rights, from you under this License will not have + their licenses terminated so long as such parties remain in + full compliance. +

    Section 5

    You are not required to accept this License, since you have + not signed it. However, nothing else grants you permission to + modify or distribute the Program or its derivative works. + These actions are prohibited by law if you do not accept this + License. Therefore, by modifying or distributing the Program + (or any work based on the Program), you indicate your + acceptance of this License to do so, and all its terms and + conditions for copying, distributing or modifying the Program + or works based on it. +

    Section 6

    Each time you redistribute the Program (or any work based on + the Program), the recipient automatically receives a license + from the original licensor to copy, distribute or modify the + Program subject to these terms and conditions. You may not + impose any further restrictions on the recipients' exercise of + the rights granted herein. You are not responsible for + enforcing compliance by third parties to this License. +

    Section 7

    If, as a consequence of a court judgment or allegation of + patent infringement or for any other reason (not limited to + patent issues), conditions are imposed on you (whether by + court order, agreement or otherwise) that contradict the + conditions of this License, they do not excuse you from the + conditions of this License. If you cannot distribute so as to + satisfy simultaneously your obligations under this License and + any other pertinent obligations, then as a consequence you may + not distribute the Program at all. For example, if a patent + license would not permit royalty-free redistribution of the + Program by all those who receive copies directly or indirectly + through you, then the only way you could satisfy both it and + this License would be to refrain entirely from distribution of + the Program. +

    If any portion of this section is held invalid or + unenforceable under any particular circumstance, the balance + of the section is intended to apply and the section as a whole + is intended to apply in other circumstances. +

    It is not the purpose of this section to induce you to + infringe any patents or other property right claims or to + contest validity of any such claims; this section has the sole + purpose of protecting the integrity of the free software + distribution system, which is implemented by public license + practices. Many people have made generous contributions to the + wide range of software distributed through that system in + reliance on consistent application of that system; it is up to + the author/donor to decide if he or she is willing to + distribute software through any other system and a licensee + cannot impose that choice. +

    This section is intended to make thoroughly clear what is + believed to be a consequence of the rest of this License. +

    Section 8

    If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted + interfaces, the original copyright holder who places the + Program under this License may add an explicit geographical + distribution limitation excluding those countries, so that + distribution is permitted only in or among countries not thus + excluded. In such case, this License incorporates the + limitation as if written in the body of this License. +

    Section 9

    The Free Software Foundation may publish revised and/or new + versions of the General Public License from time to time. Such + new versions will be similar in spirit to the present version, + but may differ in detail to address new problems or concerns. +

    Each version is given a distinguishing version number. If the + Program specifies a version number of this License which + applies to it and "any later version", you have the option of + following the terms and conditions either of that version or + of any later version published by the Free Software + Foundation. If the Program does not specify a version number + of this License, you may choose any version ever published by + the Free Software Foundation. +

    Section 10

    If you wish to incorporate parts of the Program into other + free programs whose distribution conditions are different, + write to the author to ask for permission. For software which + is copyrighted by the Free Software Foundation, write to the + Free Software Foundation; we sometimes make exceptions for + this. Our decision will be guided by the two goals of + preserving the free status of all derivatives of our free + software and of promoting the sharing and reuse of software + generally. +

    NO WARRANTY

    Section 11

    BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY + APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE + COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS + IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE + ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM + IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME + THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +

    Section 12

    IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY + MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE + LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, + INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR + INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO + LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES + SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM + TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR + OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + DAMAGES. +

    PrevHome 
    GNU General Public LicenseUp 
    \ No newline at end of file diff --git a/doc/developer/reference-html/gpl.html b/doc/developer/reference-html/gpl.html new file mode 100644 index 0000000..92c79e6 --- /dev/null +++ b/doc/developer/reference-html/gpl.html @@ -0,0 +1,236 @@ + +GNU General Public License
    The Developer's Guide to Gutenprint
    PrevNext

    Appendix A. GNU General Public License

    Preamble

    The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General + Public License is intended to guarantee your freedom to share + and change free software - to make sure the software is free for + all its users. This General Public License applies to most of + the Free Software Foundation's software and to any other program + whose authors commit to using it. (Some other Free Software + Foundation software is covered by the GNU Library General Public + License instead.) You can apply it to your programs, too. +

    When we speak of free software, we are referring to freedom, not + price. Our General Public Licenses are designed to make sure + that you have the freedom to distribute copies of free software + (and charge for this service if you wish), that you receive + source code or can get it if you want it, that you can change + the software or use pieces of it in new free programs; and that + you know you can do these things. +

    To protect your rights, we need to make restrictions that forbid + anyone to deny you these rights or to ask you to surrender the + rights. These restrictions translate to certain responsibilities + for you if you distribute copies of the software, or if you + modify it. +

    For example, if you distribute copies of such a program, whether + gratis or for a fee, you must give the recipients all the rights + that you have. You must make sure that they, too, receive or can + get the source code. And you must show them these terms so they + know their rights. +

    We protect your rights with two steps: + +

    1. copyright the software, and +

    2. offer you this license which gives you legal permission to + copy, distribute and/or modify the software. +

    +

    Also, for each author's protection and ours, we want to make + certain that everyone understands that there is no warranty for + this free software. If the software is modified by someone else + and passed on, we want its recipients to know that what they + have is not the original, so that any problems introduced by + others will not reflect on the original authors' reputations. +

    Finally, any free program is threatened constantly by software + patents. We wish to avoid the danger that redistributors of a + free program will individually obtain patent licenses, in effect + making the program proprietary. To prevent this, we have made it + clear that any patent must be licensed for everyone's free use + or not licensed at all. +

    The precise terms and conditions for copying, distribution and + modification follow. +

    PrevHomeNext
    Dithering TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
    \ No newline at end of file diff --git a/doc/developer/reference-html/index.html b/doc/developer/reference-html/index.html deleted file mode 100644 index 0c894e7..0000000 --- a/doc/developer/reference-html/index.html +++ /dev/null @@ -1,481 +0,0 @@ - -The Developer's Guide to Gutenprint

    The Developer's Guide to Gutenprint

    The Gutenprint Project -

    Copyright © 2003 The Gutenprint Project

    This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. -

    This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -

    You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. -

    Table of Contents
    Preface
    1. Copying, modification and redistribution
    2. Using libgutenprint
    2.1. Code prerequisites
    2.2. Linking with libgutenprint
    2.3. Integrating libgutenprint
    2.3.1. pkg-config
    2.3.2. make
    2.3.3. autoconf
    2.3.4. automake
    3. Reporting Bugs
    4. Adding a new printer
    4.1. printers.xml
    4.2. The driver file
    4.2.1. Epson inkjet printers
    4.2.2. Tuning the printer
    4.2.3. Canon inkjet printers
    5. ESC/P2
    5.1. Standard commands
    5.2. Remote Mode Commands
    5.3. Appropriate Remote Commands
    6. Weaving for inkjet printers
    6.1. Introduction
    6.2. Weaving algorithms
    6.2.1. Simple weaving algorithms
    6.2.2. Perfect weaving
    6.2.3. Weaving collisions
    6.2.4. What makes a “perfect” weave?
    6.2.5. Oversampling
    7. Dithering
    A. GNU General Public License
    A.1. Preamble
    A.2. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
    A.2.1. Section 0
    A.2.2. Section 1
    A.2.3. Section 2
    A.2.4. Section 3
    A.2.5. Section 4
    A.2.6. Section 5
    A.2.7. Section 6
    A.2.8. Section 7
    A.2.9. Section 8
    A.2.10. Section 9
    A.2.11. Section 10
    A.2.12. NO WARRANTY
    A.2.13. Section 12
      Next
      Preface
    \ No newline at end of file diff --git a/doc/developer/reference-html/ln10.html b/doc/developer/reference-html/ln10.html new file mode 100644 index 0000000..24f7a7f --- /dev/null +++ b/doc/developer/reference-html/ln10.html @@ -0,0 +1,97 @@ + +
    The Developer's Guide to Gutenprint

    This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. +

    This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +

    You should have received a copy of the GNU General Public + License along with this program; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. +

     Home 
    \ No newline at end of file diff --git a/doc/developer/reference-html/stylesheet-images/caution.gif b/doc/developer/reference-html/stylesheet-images/caution.gif new file mode 100644 index 0000000..9cc2e15 Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/caution.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/home.gif b/doc/developer/reference-html/stylesheet-images/home.gif new file mode 100644 index 0000000..55e1d59 Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/home.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/important.gif b/doc/developer/reference-html/stylesheet-images/important.gif new file mode 100644 index 0000000..25e40c7 Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/important.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/next.gif b/doc/developer/reference-html/stylesheet-images/next.gif new file mode 100644 index 0000000..8c502e7 Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/next.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/note.gif b/doc/developer/reference-html/stylesheet-images/note.gif new file mode 100644 index 0000000..7322e8e Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/note.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/prev.gif b/doc/developer/reference-html/stylesheet-images/prev.gif new file mode 100644 index 0000000..0894d9e Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/prev.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/tip.gif b/doc/developer/reference-html/stylesheet-images/tip.gif new file mode 100644 index 0000000..f062955 Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/tip.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/toc-blank.gif b/doc/developer/reference-html/stylesheet-images/toc-blank.gif new file mode 100644 index 0000000..6c65e3a Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/toc-blank.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/toc-minus.gif b/doc/developer/reference-html/stylesheet-images/toc-minus.gif new file mode 100644 index 0000000..40ebe61 Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/toc-minus.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/toc-plus.gif b/doc/developer/reference-html/stylesheet-images/toc-plus.gif new file mode 100644 index 0000000..3e9e7d5 Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/toc-plus.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/up.gif b/doc/developer/reference-html/stylesheet-images/up.gif new file mode 100644 index 0000000..e899a27 Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/up.gif differ diff --git a/doc/developer/reference-html/stylesheet-images/warning.gif b/doc/developer/reference-html/stylesheet-images/warning.gif new file mode 100644 index 0000000..a587079 Binary files /dev/null and b/doc/developer/reference-html/stylesheet-images/warning.gif differ diff --git a/doc/developer/reference-html/x1669.html b/doc/developer/reference-html/x1669.html index 1080dee..4fad283 100644 --- a/doc/developer/reference-html/x1669.html +++ b/doc/developer/reference-html/x1669.html @@ -1,14 +1,14 @@ - + Appropriate Remote Commands
    5.3. Appropriate Remote CommandsAppropriate Remote Commands

    All of the remote commands described above are wrapped up with the usual boilerplate. The files always start with - 00 00 00 and the “magic” - command described above, then two 00 00 00 and the “magic†+ command described above, then two ESC @ESC @s to reset the printer. The remote command sequences come next; if they print anything that is usually followed by a - FF (FF (0C0C hex) character to feed the page, then the file ends with another two - ESC @ESC @s to get back to the ground state.

  • Host uses Host uses DTDT to print an alignment sheet.

  • Host sends a Host sends a DADA command indicating which pattern the user chose.

  • If the user said “realign”, meaning he isn't +> If the user said “realignâ€, meaning he isn't done yet, go to step 1.

  • We are done: host sends a We are done: host sends a SVSV command and exits. 

    • PM 00 00
@@ -167,6 +170,9 @@ SN 00 00 00
 EX 00 00 00 00 05 01
 ST 00 01
 SM 00 02

    PM 00 00
@@ -189,6 +201,9 @@ SN 00 01 00
 SN 00 02 01
 EX 00 00 00 00 05 00
 FP 00 00 00

    IR 00 02
 LD

    For different paper type settings on the STP 870, the - arguments to SNSN vary. The arguments to the - first and third SNSN commands are as outlined - in the description of the SNSN command above; - the arguments to the second (“platen gap”) are - 00 01 01 for thick papers (“matte - paper—heavyweight”, “photo paper” and - “premium glossy photo paper”) and 00 01 01 for thick papers (“matte + paper—heavyweightâ€, “photo paper†and + “premium glossy photo paperâ€) and 00 01 - 00 for all others.

    For roll-mode printing, the STP 870's sequence changes as - follows. IR's arguments become IR's arguments become 00 - 01 in the header, and in the header, and 00 0000 00 after - the job, and EXEX's last argument changes from

    For zero-margin printing on the STP 870, the arguments to - FP become FP become 00 0xb0 0xff00 0xb0 0xff. This moves the origin about 5.5mm to the left, to a point one tenth of an inch to the left of the left-hand edge of the @@ -306,7 +330,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" >Home + Weaving algorithms

    6.2. Weaving algorithmsWeaving algorithms

    I considered a few algorithms to perform the weave. The first - one I devised let me use only (jets − + one I devised let me use only (jets − distance_between_jets + 1) nozzles, or 25. This is OK in principle, but it's slower than using all nozzles. By playing around with it some more, I came up with an algorithm that lets @@ -88,13 +85,13 @@ NAME="AEN1734" >

    This still produces some banding, though. Even better quality can be achieved by using multiple nozzles on the same line. How - do we do this? In 1440×720 mode, we're printing two + do we do this? In 1440×720 mode, we're printing two output lines at the same vertical position. However, if we want four passes, we have to effectively print each line twice. Actually doing this would increase the density, so what we do is print half the dots on each pass. This produces near-perfect output, and it's far faster than using (pseudo) - “MicroWeave”. + “MicroWeaveâ€.

    Yet another complication is how to get near the top and bottom @@ -128,7 +125,7 @@ CLASS="sect2" CLASS="sect2" >6.2.1. Simple weaving algorithmsSimple weaving algorithms

    The initial problem is to calculate the starting position of @@ -141,12 +138,12 @@ NAME="AEN1740"

    Once we have a formula for the starting row of each pass, we - then turn that “inside out” to get a formula for + then turn that “inside out†to get a formula for the pass number containing each row.

    First, let's define how our printer works. We measure - vertical position on the paper in “rows”; the + vertical position on the paper in “rowsâ€; the resolution with which the printer can position the paper vertically. The print head contains J ink jets, which are spaced S rows apart. @@ -160,7 +157,7 @@ NAME="AEN1740" > It's pretty obvious how to do this. We make one pass with the print head, printing J lines of data, each line S rows after the previous one. We then advance the paper by S - × J rows and print the next row. For example, if J = + × J rows and print the next row. For example, if J = 7 and S = 4, this method can be illustrated like this: 

    pass number
@@ -183,6 +186,9 @@ CLASS="screen"
                             4 rows offset from one jet to the next
 \---------------------------/
    7*4=28 rows offset from one pass to the next

    0 and starts at row 0. Each - subsequent pass p starts at row p × S × J. Each + subsequent pass p starts at row p × S × J. Each pass prints J lines, each line being S rows after the previous one. (For ease of viewing this file on a standard terminal, I'm clipping the examples at column 80.) @@ -215,7 +221,7 @@ CLASS="computeroutput" rows with printing to get a full-density page (we're ignoring oversampling at this stage). Where we have previously printed a single pass, we'll now print a - “pass block”: we print extra passes to fill in + “pass blockâ€: we print extra passes to fill in the empty rows. A naive implementation might look like this: 

    0 *---*---*---*---*---*---*
@@ -240,12 +252,15 @@ CLASS="screen"
 9                                                          *---*---*---*---*---*
 10                                                          *---*---*---*---*---
 11                                                           *---*---*---*---*--

    (Now you can see why this process is called - “weaving”!) + “weavingâ€!)

    6.2.2. Perfect weavingPerfect weaving

    This simple weave pattern prints every row, but will give @@ -271,15 +286,15 @@ NAME="AEN1757" each pass as possible.

    Each pass block prints S × J lines in S passes. The - first line printed in each pass block is S × J rows +> Each pass block prints S × J lines in S passes. The + first line printed in each pass block is S × J rows lower on the page than the first line printed in the previous pass block. Therefore, if we advance the paper by J rows between each pass, we can print the right number of passes in each block and advance the paper perfectly evenly.

    Here's what this “perfect” weave looks like: +> Here's what this “perfect†weave looks like: 

                        start of full weave
@@ -304,13 +325,16 @@ CLASS="screen"
 9                                                                *---*---*---*--
 10                                                                      *---*---
 11                                                                             *

    You'll notice that, for the first few rows, this weave is - too sparse. It is not until the row marked “start of - full weave” that every subsequent row is printed. We + too sparse. It is not until the row marked “start of + full weave†that every subsequent row is printed. We can calculate this start position as follows: 

    start = (S − 1) × (J − 1)
    start = (S − 1) × (J − 1)

    S = 2, J = 7, start = (2−1) × (7−1) = 6: +> S = 2, J = 7, start = (2−1) × (7−1) = 6: 

            starting row of full weave
@@ -355,6 +394,9 @@ CLASS="screen"
 5                                    *-*-*-*-*-*-*
 6                                           *-*-*-*-*-*-*
 7                                                  *-*-*-*-*-*-*

    S = 7, J = 2, start = 6: 

            start
@@ -382,6 +430,9 @@ CLASS="screen"
 7               *------*
 8                 *------*
 9                   *------*

    S = 4, J = 13, start = 36: 

                                          start
@@ -405,6 +462,9 @@ CLASS="screen"
 3                                        *---*---*---*---*---*---*---*---*---*--
 4                                                     *---*---*---*---*---*---*-
 5                                                                  *---*---*---*

    S = 13, J = 4, start = 36: 

                                          start
@@ -442,6 +508,9 @@ CLASS="screen"
 17                                                                    *---------
 18                                                                        *-----
 19                                                                            *-

    S = 8, J = 5, start = 28: 

                                  start
@@ -475,6 +550,9 @@ CLASS="screen"
 13                                                                 *-------*----
 14                                                                      *-------
 15                                                                           *--

    S = 9, J = 5, start = 32: 

                                      start
@@ -508,6 +592,9 @@ CLASS="screen"
 13                                                                 *--------*---
 14                                                                      *-------
 15                                                                           *--

    S = 6, J = 7, start = 30: 

                                    start
@@ -537,6 +630,9 @@ CLASS="screen"
 9                                                                *-----*-----*--
 10                                                                      *-----*-
 11                                                                             *

    6.2.3. Weaving collisionsWeaving collisions

    A perfect weave is not possible in all cases. Let's look at @@ -563,6 +659,12 @@ NAME="AEN1794" >

    S = 6, J = 4: 

    0 *-----*-----*-----*
@@ -573,6 +675,9 @@ CLASS="screen"
 5             |   ^ | *-^---*-----*-----*
               OUCH!   ^ |   ^
                       |     |

    row(p, j) = (p × J) + (j × S)
    row(p, j) = (p × J) + (j × S)

    row(0, 2) = (0 × 4) + (2 × 6) = 12
-row(3, 0) = (3 × 4) + (0 × 6) = 12
    row(0, 2) = (0 × 4) + (2 × 6) = 12 +row(3, 0) = (3 × 4) + (0 × 6) = 12

    S = 6, J = 4: 

    0 *-----*-----*-----*
@@ -644,6 +773,9 @@ CLASS="screen"
 3             ^-----^-----*-----*
 4                 ^-----^-----*-----*
 5                     ^-----^-----*-----*

    6.2.4. What makes a “perfect” weave?What makes a “perfect†weave?

    So what causes the perfect weave cases to be perfect, and @@ -730,9 +862,9 @@ TYPE="1" >

    These repeated subtractions can be done with C's These repeated subtractions can be done with C's %% operator, so we can write this in C as follows: 

    unsigned int
@@ -757,18 +895,21 @@ gcd(unsigned int x, unsigned int y)
   }
   return y;
 }

    gcd(S,J)gcd(S,J) will feature quite prominently in our weaving algorithm.

    If 0 ≤ j < J, there should only be a single pair (p, j) +> If 0 ≤ j < J, there should only be a single pair (p, j) for any given row number. If S and J are not relatively prime, this assumption breaks down. (For conciseness, let G = GCD(S,J).) @@ -783,6 +924,12 @@ NAME="AEN1841" >

    S = 8, J = 6, G = 2: 

    0 *-------*-------*-------*-------*-------*
@@ -791,6 +938,9 @@ CLASS="screen"
 3                   *-------*-------*-------*-------*-------*
 4                         ^-------^-------^-------*-------*-------*
 5                               ^-------^-------^-------*-------*-------*

    0 *-------*-------*       -       -       -
@@ -820,6 +976,9 @@ CLASS="screen"
 3          *-------*-------*       -       -       -
 4             *-------*-------*       -       -       -
 5                *-------*-------*       -       -       -

    0 *-------*-------*       -       -       -
@@ -844,6 +1009,9 @@ CLASS="screen"
 5                               *-------*-------*       -       -       -
              ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^
             These rows need filling in.

    Let's analyse this. Consider how a pass p could collide - with pass 0. Pass p starts at offset p × J. Pass 0 - prints at rows which are multiples of S. If p × J is + with pass 0. Pass p starts at offset p × J. Pass 0 + prints at rows which are multiples of S. If p × J is exactly divisible by S, a collision has occurred, unless (p - ×J) ≥ J × S (which will happen when we + ×J) ≥ J × S (which will happen when we finish a pass block).

    So, we want to find p and q such that p × J = q - × S and p is minimised. Then p is the number of rows +> So, we want to find p and q such that p × J = q + × S and p is minimised. Then p is the number of rows before a collision, and q is the number of jets in pass 0 which are not involved in the collision. To do this, we find the lowest common multiple of J and S, which is L = (J - × S) / G. L / J is the number of rows before a + × S) / G. L / J is the number of rows before a collision, and L / S is the number of jets in the first pass not involved in the collision.

    Thus, we see that the first J / G rows printed by a given pass are not overprinted by any later pass. However, the rest of the rows printed by pass p are overprinted by the - first J − (J / G) jets of pass p + (S / G). We will + first J − (J / G) jets of pass p + (S / G). We will use C to refer to S / G, the number of rows after which a collision occurs.

    S = 6, J = 9, G = 3, C = S / G = 2: 

    0 *-----*-----*-----*-----*-----*-----*-----*-----*
@@ -904,11 +1078,14 @@ CLASS="screen"
 5                                              ^-----^-----^-----^-----^-----^--
        ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^
             These rows need filling in.

    In this case, the first J − (J / G) = 9 − (9 / +> In this case, the first J − (J / G) = 9 − (9 / 3) = 6 jets of pass p + (6 / 3) = p + 2 collide with the last 6 jets of pass p. Only one row in every G = 2 rows is printed by this weave. @@ -923,6 +1100,12 @@ NAME="AEN1861" >

    S = 9, J = 6, G = 3, C = 3: 

    
0 *--------*--------*--------*--------*--------*
@@ -931,6 +1114,9 @@ CLASS="screen"
 3                   ^--------^--------^--------^--------*--------*
 4                         ^--------^--------^--------^--------*--------*
 5                               ^--------^--------^--------^--------*--------*

    Here, the first J - (J / G) = 6 - (6 / 3) = 4 jets of pass p + (9 / 3) = p + 3 collide with the last 4 jets of pass @@ -967,6 +1153,12 @@ NAME="AEN1868" >

    S = 7, J = 2, G = 1: 

                  imaginary extra jet
@@ -982,25 +1174,28 @@ CLASS="screen"
 7               *------*  <--start of pass block 1
 8                 *------*
 9                   *------*

    We can now calculate the start of a given pass by reference to its pass block. The first pass of pass block - b always starts at row (b × S × J). The start + b always starts at row (b × S × J). The start row of each of the other passes in the block are calculated using offsets from this row.

    For the example above, there are 7 passes in each pass block, and their offsets are 0, 2, 4, 6, 8, 10 and 12. - The next pass block is offset S × J = 14 rows from + The next pass block is offset S × J = 14 rows from the start of the current pass block.

    The simplest way to modify the “perfect” weave - pattern to give a correct weave in cases where G ≠ 1 +> The simplest way to modify the “perfect†weave + pattern to give a correct weave in cases where G ≠ 1 is to simply change any offsets which would result in a collision, until the collision disappears. Every printed row in the weave, as we have shown it up to now, is @@ -1029,7 +1224,7 @@ CLASS="screen" The passes in the second subblock each have 1 added to their offset, the passes in the third subblock have 2 added, and so on. Thus, the offset of pass p (numbered - relative to the start of its pass block) is p × J + + relative to the start of its pass block) is p × J + floor(p / B).

    S = 6, J = 9, G = 3, B = 2: 

    0 *-----*-----*-----*-----*-----*-----*-----*-----*
@@ -1060,6 +1261,9 @@ CLASS="screen"
   |              |                  start of subblock 2 (offset 2 rows)
   |              start of subblock 1 (following passes offset by 1 row)
 start of passblock 0, subblock 0 (pass start calculated as p*J)

    S = 9, J = 6, G = 3, B = 3: 

    0 *--------*--------*--------*--------*--------*
@@ -1088,6 +1298,9 @@ CLASS="screen"
 10                                                  \---/     *--------*--------
 11                                               small offset       *--------*--
 12                                                                         *----

    S = 8, J = 4, G = 4, B = 2: 

    0 *-------*-------*-------*
@@ -1120,6 +1339,9 @@ CLASS="screen"
 8                                 *-------*-------*-------*
 9                                \/   *-------*-------*-------*
                             very small offset!

    subblock number
@@ -1148,6 +1376,9 @@ CLASS="screen"
 1  *
 2   *
 3    *

    offset(b) = 2*b             , if b < ceiling(G/2)
           = 2*(G-b)-1       , otherwise

    0123456789
@@ -1208,6 +1454,9 @@ CLASS="screen"
 7      *
 8    *
 9  *

               1
@@ -1247,6 +1502,9 @@ CLASS="screen"
  8      *
  9    *
 10  *

    S = 12, J = 6, G = 6, B = 2: 

    0 *-----------*-----------*-----------*-----------*-----------*
@@ -1278,6 +1542,9 @@ CLASS="screen"
 10                                                             *-----------*----
 11                                                                   *----------
 12                                                                        *-----

    (This might seem odd, but it occurs to me that a good weave pattern might also make a good score for bell ringers. When church bells are rung, a list of - “changes” are used. For example, if 8 bells + “changes†are used. For example, if 8 bells are being used, they will, at first, be rung in order: 12345678. If the first change is for bells 5 and 6, the bells will then be rung in the order 12346578. If the @@ -1317,6 +1584,12 @@ CLASS="informalexample" >
    passesperblock = S
@@ -1330,6 +1603,9 @@ if subpassblock < ceiling(subblocksperblock/2)
 else
   subblockoffset = 2*(subblocksperblock-subpassblock)-1
 startingrow = passblock * S * J + offsetinpassblock * J + subblockoffset

    subblocksperblock = gcd(S, J)
@@ -1354,6 +1636,9 @@ if subpassblock * 2 < subblocksperblock
 else
   subblockoffset = 2*(subblocksperblock-subpassblock)-1
 startingrow = p * J + subblockoffset

    subblocksperblock = gcd(S, J)
@@ -1378,11 +1669,14 @@ subblockoffset(p)
     subpassblock = floor((p % S) * subblocksperblock / S)
 
 row(j, p) = p * J + subblockoffset(p) + j * S

    Together with the inequality 0 ≤ j < J, we can use +> Together with the inequality 0 ≤ j < J, we can use this definition in reverse to calculate the pass number containing a given row, r. Working out the inverse definition involves a little guesswork, but one possible @@ -1397,11 +1691,20 @@ CLASS="informalexample" >
    subblocksperblock = gcd(S, J)
 subblockoffset = r % subblocksperblock
 pass = (r - subblockoffset) / J

    offset = r % J
@@ -1426,6 +1735,9 @@ pass--
 offset += J
 }
 jet = offset / S

    G = gcd(S, J)
@@ -1459,6 +1777,9 @@ subblockretreat = floor(pass / passespersubblock) % G
 pass -= subblockretreat * passespersubblock
 pass += subpassblock * passespersubblock
 jet = (r - subblockoffset - pass * J) / S

    0 *-----*-----*-----*
@@ -1500,6 +1827,9 @@ CLASS="screen"
 17                                                                     *-----*--
 18                                                                        *-----
 19                                                                            *-

    0 *-------*-------*-------*-------*-------*
@@ -1530,6 +1866,9 @@ CLASS="screen"
 10                                                            *-------*-------*-
 11                                                                  *-------*---
 12                                                                         *----

    0 *-----*-----*-----*-----*-----*-----*-----*-----*-----*-----*-----*
@@ -1554,6 +1899,9 @@ CLASS="screen"
 4                                                    *-----*-----*-----*-----*--
 5                                                              *-----*-----*----
 6                                                                         *-----

    6.2.5. OversamplingOversampling

    By oversampling, we mean printing on the same row more than @@ -1589,7 +1937,7 @@ NAME="AEN1937" necessary to get a 1/1440" horizontal resolution. If it can only print two drops 1/360" apart, 4x oversampling will be necessary for a 1/1440" horizontal resolution. The printer - enforces this “drop spacing” by only accepting + enforces this “drop spacing†by only accepting raster passes with a horizontal resolution matching the spacing with which it can print dots, so we must print passes at different horizontal positions if we are to obtain @@ -1600,18 +1948,18 @@ NAME="AEN1937" >

    Oversampling can also be done to decrease the banding apparent in an image. By splitting a row into two or more - sets of dots (“lines”) and printing each line on + sets of dots (“linesâ€) and printing each line on the same row, but with a different nozzle for each line, we can get a smoother print.

    To quantify these two kinds of oversampling, we'll introduce two new constants: H shows how many different horizontal - offsets we want to print at (the “horizontal - oversampling”) while O shows how many times we want to + offsets we want to print at (the “horizontal + oversamplingâ€) while O shows how many times we want to print each row, over and above the number of times necessary - for horizontal oversampling (the “extra - oversampling”). + for horizontal oversampling (the “extra + oversamplingâ€).

    It is necessary for all the lines printed by a given pass to @@ -1629,10 +1977,10 @@ NAME="AEN1937" advance the paper between passes. Previously, we'd have defined A = J; we now let A = J / H. This also affects our pass blocks. Printing one pass block used to involve - advancing the paper S × J rows; it now advances the - paper (S×J) / H rows. We therefore name a group of H - pass blocks a “band”. Printing one band - involves advancing the paper S×J rows, as a pass + advancing the paper S × J rows; it now advances the + paper (S×J) / H rows. We therefore name a group of H + pass blocks a “bandâ€. Printing one band + involves advancing the paper S×J rows, as a pass block did before. 

    0 *---*---*---*---*---*---*---*---*---*
@@ -1672,6 +2026,9 @@ CLASS="screen"
 13                                                                 *---*---*---*
 14                                                                      *---*---
 15                                                                           *--

    *s - with integers in the range [0…H−1]. + with integers in the range [0…H−1].

    Overprinting occurs once per pass block, so we can simply @@ -1698,6 +2055,12 @@ CLASS="informalexample" >
    0 0---0---0---0---0---0---0---0---0---0
@@ -1716,6 +2079,9 @@ CLASS="screen"
 13                                                                 1---1---1---1
 14                                                                      1---1---
 15                                                                           1--

    0 0---0---0---0---0---0---0---0---0---0---0---0
@@ -1747,6 +2119,9 @@ CLASS="screen"
 10                                                             0---0---0---0---0
 11                                                                   0---0---0--
 12                                                                        1---1-

    Band 0:
@@ -1790,6 +2171,9 @@ Band 1:
 12                                                                1---1---1---1-
 13                                                                     1---1---1
 14                                                                          1---

    A = floor(J / H)
@@ -1817,6 +2207,9 @@ band = floor(P / (S * H))
 passinband = P % (S * H)
 startingrow = band * S * J + passinband * A + subblockoffset
 subpass = passinband / S

    A = floor(J / H)
@@ -1845,8 +2244,11 @@ passinband(p) = p % (S * H)
 
 row(j, p) = band(p) * S * J + passinband(p) * A + subblockoffset(p) + j * S
 row(j, p) = p * J + subblockoffset(p) + j * S

    To be continued… +> To be continued…

    Home -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
    The Developer's Guide to Gutenprint
    PrevAppendix A. GNU General Public License 

    A.2. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

    A.2.1. Section 0

    This License applies to any program or other work which - contains a notice placed by the copyright holder saying it may - be distributed under the terms of this General Public - License. The "Program", below, refers to any such program or - work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: - that is to say, a work containing the Program or a portion of - it, either verbatim or with modifications and/or translated - into another language. (Hereinafter, translation is included - without limitation in the term "modification".) - Each licensee is addressed as "you". -

    Activities other than copying, distribution and modification - are not covered by this License; they are outside its - scope. The act of running the Program is not restricted, and - the output from the Program is covered only if its contents - constitute a work based on the Program (independent of having - been made by running the Program). Whether that is true - depends on what the Program does. -

    A.2.2. Section 1

    You may copy and distribute verbatim copies of the Program's - source code as you receive it, in any medium, provided that - you conspicuously and appropriately publish on each copy an - appropriate copyright notice and disclaimer of warranty; keep - intact all the notices that refer to this License and to the - absence of any warranty; and give any other recipients of the - Program a copy of this License along with the Program. -

    You may charge a fee for the physical act of transferring a - copy, and you may at your option offer warranty protection in - exchange for a fee. -

    A.2.3. Section 2

    You may modify your copy or copies of the Program or any - portion of it, thus forming a work based on the Program, and - copy and distribute such modifications or work under the terms - of Section 1 above, provided - that you also meet all of these conditions: - -

    1. You must cause the modified files to carry prominent - notices stating that you changed the files and the date - of any change. -

    2. You must cause any work that you distribute or publish, - that in whole or in part contains or is derived from the - Program or any part thereof, to be licensed as a whole - at no charge to all third parties under the terms of - this License. -

    3. If the modified program normally reads commands - interactively when run, you must cause it, when started - running for such interactive use in the most ordinary - way, to print or display an announcement including an - appropriate copyright notice and a notice that there is - no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program - under these conditions, and telling the user how to view - a copy of this License. - -

      Exception:
       

      If the Program itself is interactive but does not - normally print such an announcement, your work based - on the Program is not required to print an - announcement.) -

      - -

    -

    These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the - Program, and can be reasonably considered independent and - separate works in themselves, then this License, and its - terms, do not apply to those sections when you distribute them - as separate works. But when you distribute the same sections - as part of a whole which is a work based on the Program, the - distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the - entire whole, and thus to each and every part regardless of - who wrote it. -

    Thus, it is not the intent of this section to claim rights or - contest your rights to work written entirely by you; rather, - the intent is to exercise the right to control the - distribution of derivative or collective works based on the - Program. -

    In addition, mere aggregation of another work not based on the - Program with the Program (or with a work based on the Program) - on a volume of a storage or distribution medium does not bring - the other work under the scope of this License. -

    A.2.4. Section 3

    You may copy and distribute the Program (or a work based on - it, under Section 2 in object - code or executable form under the terms of Sections 1 and 2 above provided that you also do - one of the following: - -

    1. Accompany it with the complete corresponding - machine-readable source code, which must be distributed - under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, -

    2. Accompany it with a written offer, valid for at least - three years, to give any third party, for a charge no - more than your cost of physically performing source - distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the - terms of Sections 1 and 2 above on a medium customarily - used for software interchange; or, -

    3. Accompany it with the information you received as to the - offer to distribute corresponding source code. (This - alternative is allowed only for noncommercial - distribution and only if you received the program in - object code or executable form with such an offer, in - accord with Subsection b above.) -

    -

    The source code for a work means the preferred form of the - work for making modifications to it. For an executable work, - complete source code means all the source code for all modules - it contains, plus any associated interface definition files, - plus the scripts used to control compilation and installation - of the executable. However, as a special exception, the source - code distributed need not include anything that is normally - distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating - system on which the executable runs, unless that component - itself accompanies the executable. -

    If distribution of executable or object code is made by - offering access to copy from a designated place, then offering - equivalent access to copy the source code from the same place - counts as distribution of the source code, even though third - parties are not compelled to copy the source along with the - object code. -

    A.2.5. Section 4

    You may not copy, modify, sublicense, or distribute the - Program except as expressly provided under this License. Any - attempt otherwise to copy, modify, sublicense or distribute - the Program is void, and will automatically terminate your - rights under this License. However, parties who have received - copies, or rights, from you under this License will not have - their licenses terminated so long as such parties remain in - full compliance. -

    A.2.6. Section 5

    You are not required to accept this License, since you have - not signed it. However, nothing else grants you permission to - modify or distribute the Program or its derivative works. - These actions are prohibited by law if you do not accept this - License. Therefore, by modifying or distributing the Program - (or any work based on the Program), you indicate your - acceptance of this License to do so, and all its terms and - conditions for copying, distributing or modifying the Program - or works based on it. -

    A.2.7. Section 6

    Each time you redistribute the Program (or any work based on - the Program), the recipient automatically receives a license - from the original licensor to copy, distribute or modify the - Program subject to these terms and conditions. You may not - impose any further restrictions on the recipients' exercise of - the rights granted herein. You are not responsible for - enforcing compliance by third parties to this License. -

    A.2.8. Section 7

    If, as a consequence of a court judgment or allegation of - patent infringement or for any other reason (not limited to - patent issues), conditions are imposed on you (whether by - court order, agreement or otherwise) that contradict the - conditions of this License, they do not excuse you from the - conditions of this License. If you cannot distribute so as to - satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may - not distribute the Program at all. For example, if a patent - license would not permit royalty-free redistribution of the - Program by all those who receive copies directly or indirectly - through you, then the only way you could satisfy both it and - this License would be to refrain entirely from distribution of - the Program. -

    If any portion of this section is held invalid or - unenforceable under any particular circumstance, the balance - of the section is intended to apply and the section as a whole - is intended to apply in other circumstances. -

    It is not the purpose of this section to induce you to - infringe any patents or other property right claims or to - contest validity of any such claims; this section has the sole - purpose of protecting the integrity of the free software - distribution system, which is implemented by public license - practices. Many people have made generous contributions to the - wide range of software distributed through that system in - reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to - distribute software through any other system and a licensee - cannot impose that choice. -

    This section is intended to make thoroughly clear what is - believed to be a consequence of the rest of this License. -

    A.2.9. Section 8

    If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted - interfaces, the original copyright holder who places the - Program under this License may add an explicit geographical - distribution limitation excluding those countries, so that - distribution is permitted only in or among countries not thus - excluded. In such case, this License incorporates the - limitation as if written in the body of this License. -

    A.2.10. Section 9

    The Free Software Foundation may publish revised and/or new - versions of the General Public License from time to time. Such - new versions will be similar in spirit to the present version, - but may differ in detail to address new problems or concerns. -

    Each version is given a distinguishing version number. If the - Program specifies a version number of this License which - applies to it and "any later version", you have the option of - following the terms and conditions either of that version or - of any later version published by the Free Software - Foundation. If the Program does not specify a version number - of this License, you may choose any version ever published by - the Free Software Foundation. -

    A.2.11. Section 10

    If you wish to incorporate parts of the Program into other - free programs whose distribution conditions are different, - write to the author to ask for permission. For software which - is copyrighted by the Free Software Foundation, write to the - Free Software Foundation; we sometimes make exceptions for - this. Our decision will be guided by the two goals of - preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software - generally. -

    A.2.12. NO WARRANTY

    Section 11

    BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY - APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE - COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS - IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM - IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME - THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. -

    A.2.13. Section 12

    IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY - MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE - LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, - INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR - INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO - LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES - SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM - TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - DAMAGES. -

    PrevHome 
    GNU General Public LicenseUp 
    \ No newline at end of file diff --git a/doc/developer/reference-html/x271.html b/doc/developer/reference-html/x271.html index 9337d74..c4b2518 100644 --- a/doc/developer/reference-html/x271.html +++ b/doc/developer/reference-html/x271.html @@ -1,14 +1,14 @@ - + The driver file
    4.2. The driver fileThe driver file

    Adding a new printer to a driver module @@ -115,7 +112,7 @@ CLASS="filename" prefer this; it isn't materially more work for the host to compute things like exact paper sizes and such, it allows a lot more tweaking, and it may be why Epson has been more open with - information—the communication protocol doesn't really + information—the communication protocol doesn't really contain very much IP, so they have less reason to keep it secret.

    4.2.1. Epson inkjet printersEpson inkjet printers

    The The model_capabilitiesmodel_capabilities vector in print-escp2.c contains one entry for each - defined printer model. The modelmodel parameter in 

    typedef struct escp2_printer
@@ -242,6 +245,9 @@ const double *hue_adjustment;
 const double *sat_adjustment;
 const paperlist_t *paperlist;
 } escp2_printer_t;

    Most printers can print using either the number of nozzles available or any smaller number. Some printers require that all of the nozzles be used. Those printers will set - min_nozzlesmin_nozzles and/or - min_black_nozzlesmin_black_nozzles to the same value as - nozzlesnozzles and/or - black_nozzlesblack_nozzles.

    Most Epson printers, other than the high-end Stylus Pro models, cannot print dots spaced more closely than 1/360" or - 1/720" apart (this is the setting for xresxres. This is true even for printers that support resolutions of 1440 or 2880 DPI. In these cases, the data must be printed in @@ -314,25 +320,25 @@ CLASS="varname" For example, the Stylus Photo EX can normally print with a dot spacing of 1/720". The smallest dot size cannot be printed with a dot spacing of less than 1/360", however. In this - case, we use enhanced_xresenhanced_xres to specify the resolution to be used in this enhanced mode, and - enhanced_resolutionenhanced_resolution to specify the printing resolution above which we use the - enhanced_xresenhanced_xres.

    The The resolution_scaleresolution_scale command is used to specify scaling factors for the dot separation on newer printers. It should always be 14400 with current printers. @@ -349,26 +355,26 @@ CLASS="function" >INCH macro defined to make specification of the - max_paper_widthmax_paper_width and - max_paper_heightmax_paper_height more legible. It multiplies 72 by the provided expression to get the appropriate number of points. For example, to - specify 8.5", INCH(17/2)INCH(17/2) expands to - (72 * 17/2)(72 * 17/2), which is evaluated left to right, and hence generates the correct value.

    1     for - separation_rowsseparation_rows and 0 for the others. Very, very few printers require (or allow) - separation_rowsseparation_rows to be anything but 1 and - pseudo_separation_rowspseudo_separation_rows other than

    zero_margin_offsetzero_margin_offset is used to specify an additional negative horizontal offset required to print to the edges of the paper on newer Stylus Photo printers. These must @@ -477,14 +483,14 @@ CLASS="emphasis" >

    The lists of dot sizes and densities contain values for 13 printing modes: 120/180 DPI using printer weaving (single row; - incorrectly referred to as “microweave”) and - “soft” weaving (the driver determines the exact + incorrectly referred to as “microweaveâ€) and + “soft†weaving (the driver determines the exact pattern of dot layout), 360 DPI microweave and softweave, - 720×360 DPI microweave and softweave, 720 DPI microweave - and softweave, 1440×720 microweave and softweave, - 2880×720 microweave and softweave, and 2880×1440 + 720×360 DPI microweave and softweave, 720 DPI microweave + and softweave, 1440×720 microweave and softweave, + 2880×720 microweave and softweave, and 2880×1440 softweave only. Printer weaving is referred to as - “microweave” for historical reasons. + “microweave†for historical reasons.

    For the dot sizes, the value for each element in the vector @@ -581,28 +587,28 @@ CLASS="constant" CLASS="constant" >0x10 usually works best at - 1440×720 and 0x11 works best at - 720×720. Unfortunately, 0x10 doesn't seem to generate quite enough density at - 720×720, because if it did the output would be very - smooth. Perhaps it's possible to tweak things… + 720×720, because if it did the output would be very + smooth. Perhaps it's possible to tweak things…

    The list of densities is a list of base density values for all - of the above listed modes. “Density” refers to + of the above listed modes. “Density†refers to the amount of ink deposited when a solid color (or solid black) is printed. So if the density is 0.5, solid black actually prints only - half the possible dots. “Base density” refers to + half the possible dots. “Base density†refers to the fact that the density value can be scaled in the GUI or on the Ghostscript command line. The density value specified (which is not made visible to the user) is multiplied by the @@ -626,8 +632,8 @@ CLASS="constant" density value that results in solid black (no visible gaps under a fairly high power magnifying glass or loupe). If an appropriate density value is found for 720 DPI, it could be - divided by 2 for 1440×720, by 4 for 2880×720, and - by 8 for 2880×1440. + divided by 2 for 1440×720, by 4 for 2880×720, and + by 8 for 2880×1440.

    However, for printers that offer a choice of dot size, this @@ -645,7 +651,7 @@ CLASS="constant" > The last member is a pointer to a structure containing a list of ink values for variable dot size (or 6 color) inks. We model variable dot size inks as producing a certain - “value” of ink for each available dot size, where + “value†of ink for each available dot size, where the largest dot size has a value of 14.2.2. Tuning the printerTuning the printer

    Now, how do you use all this to tune a printer? There are a @@ -977,7 +983,7 @@ CLASS="emphasis" credit, so too much cyan and magenta is deposited, which overwhelms the yellow). Make sure you do this on very white, very high grade inkjet paper that's designed for - 1440×720 DPI or higher; otherwise the ink will spread on + 1440×720 DPI or higher; otherwise the ink will spread on contact and you'll get values that aren't really true for high grade paper. You can, of course, calibrate for low grade paper if that's what you're going to use, but that shouldn't @@ -1000,7 +1006,7 @@ CLASS="sect2" CLASS="sect2" >4.2.3. Canon inkjet printersCanon inkjet printers

    Basically, a new Canon printer can be added to @@ -1012,8 +1018,8 @@ CLASS="filename" differences are noted here.

    In general, Canon printers have more “built-in - intelligence“ than Epson printers which results in the +> In general, Canon printers have more “built-in + intelligence“ than Epson printers which results in the fact that the driver only has to tell the printing conditions like resolutions, dot sizes, etc. to the printer and afterwards transfer the raster data line by line for each @@ -1032,6 +1038,12 @@ CLASS="informalexample" >
    typedef struct canon_caps {
@@ -1053,6 +1065,9 @@ canon_dot_size_t dot_sizes;   /* Vector of dot sizes for resolutions */
 canon_densities_t densities;  /* List of densities for each printer */
 canon_variable_inklist_t *inxs; /* Choices of inks for this printer */
 } canon_cap_t;

    Since there are Canon printers which print in resolutions of 2n × 150 DPI (e.g. 300, 600, +> × 150 DPI (e.g. 300, 600, 1200) and others which support resolutions of 2n × 180 DPI (e.g. 360, 720, +> × 180 DPI (e.g. 360, 720, 1440), there's a base resolution (150 or 180, respectively) given in the 
    static const canon_variable_inklist_t canon_ink_myinks[] =
@@ -1143,17 +1164,20 @@ CLASS="programlisting"
   &ci_CMYK_3, &ci_CMYK_3, &ci_CMYK_3,
 },
 };

    where the where the &ci_CMYK_1&ci_CMYK_1 and - &ci_CMYK_3&ci_CMYK_3 entries are references to a previously defined const of type Home + Linking with libgutenprint

    2.2. Linking with libgutenprintLinking with libgutenprint

    To link a program with libgutenprint, the option - -lgutenprint-lgutenprint needs to be passed to the compiler when linking. For example, to compile and link the following commands would be used: 

    gcc -o stpimage -lgutenprint stpimage.o

    The compiler and linker flags needed may vary depending on the options Gutenprint was configured with when it was built. The @@ -140,7 +146,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" >Home + Integrating libgutenprint

    2.3. Integrating libgutenprintIntegrating libgutenprint

    This section describes how to integrate the compiling and @@ -102,7 +99,7 @@ CLASS="sect2" CLASS="sect2" >2.3.1. pkg-configconfigure when configuring the package when - it was built, the CFLAGSCFLAGS and - LIBSLIBS parameters needed to compile and link programs with libgutenprint may vary. To make it simple to determine what these are on any given system, a @@ -143,15 +140,21 @@ CLASS="refentrytitle" > manual page for a compete synopsis.

    The correct The correct CFLAGSCFLAGS to use can be obtained - with the --cflags--cflags option: 

    pkg-config --cflags gutenprint
 -I/usr/local/include

    The correct The correct LIBSLIBS to use can the obtained - with the --libs--libs option: 

    pkg-config --libs gutenprint
 -L/usr/local/lib -lgutenprint -lm -ldl

    Lastly, the installed version of Gutenprint can be obtained with the - --version--version option: 

    pkg-config --modversion gutenprint
 4.3.23

    The command can be used from the shell by enclosing it in - backquotes ‘`’: + backquotes ‘`’: 

    gcc `pkg-config --libs gutenprint` -o
   stpimage stpimage.o

    However, this is not the way it it typically used. Normally it is used in a 2.3.2. makemake: 

    GUTENPRINT_VERSION = $(shell pkg-config --version gutenprint)
 GUTENPRINT_CFLAGS = $(shell pkg-config --cflags gutenprint)
 GUTENPRINT_LIBS = $(shell pkg-config --libs gutenprint)

    How you choose to use these variables is entirely up to you. See the GNU 2.3.3. autoconfautoconf expands - the m4 macros into ‘real’ shell script. The + the m4 macros into ‘real’ shell script. The resulting configure
    PKG_CHECK_MODULES(GUTENPRINT, gutenprint)

    2.3.4. automakeMakefile.in files such as - dist, dist, distcheckdistcheck, - clean, clean, distcleandistclean, - maintainer-clean and maintainer-clean and tagstags, and there are many more more available. See the GNU AC_SUBST     to substitute - GUTENPRINT_CFLAGSGUTENPRINT_CFLAGS and - GUTENPRINT_LIBSGUTENPRINT_LIBS, automake
    AUTOMAKE_OPTIONS = 1.7 gnu
@@ -529,6 +586,9 @@ stpimage_SOURCES = stpimage.c
 stpimage_LDADD = $(GUTENPRINT_LIBS)
 
 MAINTAINERCLEANFILES = Makefile.in

    Home + Remote Mode Commands
    5.2. Remote Mode CommandsRemote Mode Commands

    The following description of remote commands comes out of an @@ -96,9 +93,18 @@ CLASS="informalexample" >

    ESC (R BC=8 00 R E M O T E 1

    ESC 00 00 00

    All remote mode commands must be sent before the initial - ESC (GESC (G command is sent.

    NC NC BCBC=2 00 - 00

    VI VI BCBC=2 00 - 00

    On my 740, prints the following, probably “version - information”: +> On my 740, prints the following, probably “version + informationâ€: 

    W01286 I02382\r\n

    * AI * AI BC=3 00 00 00BC=3 00 00 00

    Prints a “printer ID”. On one 870, prints the +> Prints a “printer IDâ€. On one 870, prints the following: 

    51-51-50-51-49-48\r\n

    * LD * LD BC=0BC=0

    ESC @ESC @ printer reset command.

    * CH * CH BCBC=2 00 - xxxx

    Perform a head cleaning cycle. The heads to clean are - determined by parameter xxxx:

    xxxxDescription

    While While xxxx = 00 is - likely supported by all printers, xxxx =

    * DT * DT BCBC=3 00 - xx 00xx 00

    Print an alignment pattern. There are three patterns, which are picked via the choice of - xxxx. Pattern 0

    * DA * DA BCBC=4 00 - xxxx 00 - yyyy

    Set results for the alignment pattern. - xxxx is the pattern (3); - yyyy is the best choice from the set (

    * SV * SV BC=0BC=0

    * RS * RS BCBC=1 - 01

    * IQ * IQ BCBC=1 - 01

    IQ:KKCCMMYY

    IQ:KKCCMMYYccmm

    * IR * IR BCBC=2 00 - xxxx

    . This command has been observed on an STP 870 with - xxxx=03 at the start - of a job and xxxx=02 at the end of a job (where it is followed by an - LDLD command). When in roll mode, the values change to - xxxx=01 at the start - of a job and xxxx=00

    * FP * FP BCBC=3 00 - pos[2]pos[2]

    Specify the horizontal left margin in units of 1/360 inch. - The default value for pospos is

    * SN * SN BCBC=3 00 - xx xx yyyy

    Select Mechanism Sequence. Select Mechanism Sequence. xxxx controls which sub-operation is performed. - xxxx=00 selects - the “Feed paper sequence setting”. - yyyy can take on the following values (on the STP 870, at any rate):

    yyyyMedia type

    xxxx=01 controls the platen gap setting; - yyyy=00 is the - default, yyyy=1 are higher settings.

    xxxx=02 controls paper loading speed - (yyyy=01 is - used when printing on “plain paper”, - “360dpi ink jet paper” or “ink jet - transparencies”, and - yyyy=00

    xxxx=07 controls duplex printing for printers with that capability - (yy=yy=00 is default, for non-duplex printing; 1 is front - side of the paper, and 22 is back side).

    xxxx=09yyyy=0

    * PP * PP BCBC=3 00 - xxxx - yyyy

    Set Paper Path. - xxxx=2 indicates manual feed, - xxxx=3 is for roll - paper. yy selects “paper path - number”. +>yy selects “paper path + numberâ€.

    * AC * AC BCBC=2 00 - xxxx

    Set Auto Cutting State. - xxxx=0 selects auto cutting off, - xxxx=1 selects auto cutting on, and - xxxx=2

    * DR * DR BCBC=4 00 xx - DT2DT2

    Set Drying Time. - xxxx=00 sets the - drying time “per scan” (per pass?); - xxxx=01 sets the - drying time per page. DTDT indicates the drying time, which is in seconds if page mode is used and in milliseconds if scan mode is used. - DTDT must not exceed 3600 seconds in per-page mode and 10000 milliseconds in per-scan mode.

    * IK * IK BCBC=2 00 - xxxx

    Select Ink Type. - xxxx=00 selects dye ink. Pigment ink is apparently selected by - xxxx=01

    * PZ BC=2 00 xx* PZ BC=2 00 xx

    Set Pause After Printing. - xxxx=00 selects no pause after printing; - xxxx=01

    * EX * EX BCBC=6 00 00 00 00 0x14 - xxxx

    Set Vertical Print Page Line Mode. - xxxx=00 is off, - xxxx=01

    * EX * EX BCBC=6 00 00 00 00 0x05 - xxxx

    Set Roll Paper Mode. If Set Roll Paper Mode. If xxxx is 0, roll paper mode is off; if - xxxx is 1

    * EX * EX BCBC=3 00 - xx xx yyyy

    Appears to be a synonym for the Appears to be a synonym for the SNSN command described above.

    * PH * PH BCBC=2 00 - xxxx

    Select Paper Thickness. Set the paper thickness - xxxx in .1 mm units. This must not exceed 0x10 (1.6 mm). If the - thickness is set “more than” .6 mm (which - probably means “at least” 0.6 mm, since the - other case reads “less than 0.5 mm”), the + thickness is set “more than†.6 mm (which + probably means “at least†0.6 mm, since the + other case reads “less than 0.5 mmâ€), the platen gap is set high irrespective of the - SNSN command.

    * PM * PM BCBC=2 00 - 00

    * ST * ST BCBC=2 00 - xxxx

    Epson's STP 750/1200 programming guide refers to the - ST command as “Set printer - state reply”. If ST command as “Set printer + state replyâ€. If xxxx is 2, the printer will not send status replies. If - xxxx is 1
    @BDC ST\r
@@ -1318,27 +1375,30 @@ AI:CW:02kkccmmyy, MI:mm
 [TC:tttt;]
 INK:...;
 \f

    ( (\r\r is carriage return; - \n is newline; \n is newline; \f\f is formfeed.)

    STST is the printer status:

    ERER, if provided, is the error status:

    IQIQ is the amount of ink left, as a (decimal!) percentage expressed in hexadecimal. The values are black, cyan, magenta, and yellow. 6 and 7 @@ -1667,9 +1727,9 @@ CLASS="constant" >

    WRWR, if provided, is the warning status:

    Black ink low (Photo black on printers using - UltraChrome® ink) + UltraChrome® ink)

    RVRV is the firmware revision (one byte ASCII).

    AIAI is actuator information. These are two byte ASCII codes that indicate ``ink weight rank ID'' of KCMY, respectively.

    TCTC, if provided, is the total time of cleaning or ink filling (?).

    RCRC, if provided, is the firmware revision.

    INK: and INK: and MIMI are

    * SM * SM BCBC=2 00 - xxxx

    Set Status Reply Rate. Set Status Reply Rate. xxxx is the - repeat interval in seconds. If xxxx is

    * ST * ST BCBC=1 - 01

    @BDC PS\r\nST:@BDC PS\r\nST:xxxx;\f

    \r\r is carriage return; - \n is newline; \n is newline; \f\f is - formfeed). If xxxx (the reply value) is

    * SM * SM BCBC=1 - 01

    @BDC PS\r\nST:xx;\f

    \r\r is carriage return; - \n is newline; \n is newline; \f\f is - formfeed). See SM - BC=2BC=2 above for the meaning of the return value.

    * ?? - BC=BC=xxxx - y[1] … - y[1] … + y[xx]y[xx]

    ST ST BC=1BC=1 and - SM SM BC=1BC=1 commands. Note that in this case the number of bytes is variable!

    * SM * SM BCBC=2 00 - 02

    * JE * JE BCBC=1 - 00

    * CO * CO BCBC=8 00 - cutter[1] cutter[1] pagepage[1] - unitunit[1] - position[4]position[4]

    Specify paper cutting on Stylus Photo 2200 (and perhaps - some other printers). cuttercutter must be - 0. pagepage should be one of the following:

    unitunit should be one of the following:

    This command should be used twice. The first - COCO command specifies where the page will be cut at the top, and the second specifies where the page will be cut at the bottom. This permits @@ -2255,7 +2333,7 @@ WIDTH="34%" ALIGN="center" VALIGN="top" >Home array.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ array_8h gutenprint/sequence.h @@ -92,7 +92,7 @@ bit-ops.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ bit-ops_8h void @@ -146,7 +146,7 @@ channel.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ channel_8h void @@ -276,36 +276,50 @@ void - stp_channel_initialize + stp_channel_set_gcr_curve channel_8h.html a18 + (stp_vars_t *v, const stp_curve_t *curve) + + + const stp_curve_t * + stp_channel_get_gcr_curve + channel_8h.html + a19 + (stp_vars_t *v) + + + void + stp_channel_initialize + channel_8h.html + a20 (stp_vars_t *v, stp_image_t *image, int input_channel_count) void stp_channel_convert channel_8h.html - a19 + a21 (const stp_vars_t *v, unsigned *zero_mask) unsigned short * stp_channel_get_input channel_8h.html - a20 + a22 (const stp_vars_t *v) unsigned short * stp_channel_get_output channel_8h.html - a21 + a23 (const stp_vars_t *v) color.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ color_8h stp_colorfuncs_t stp_color @@ -403,7 +417,7 @@ curve-cache.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ curve-cache_8h gutenprint/curve.h stp_cached_curve_t @@ -501,7 +515,7 @@ curve.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ curve_8h gutenprint/sequence.h stp_curve_point_t @@ -907,7 +921,7 @@ dither.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ dither_8h stp_dither_matrix_short stp_dither_matrix_normal @@ -1212,7 +1226,7 @@ gutenprint-intl-internal.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ gutenprint-intl-internal_8h #define @@ -1266,7 +1280,7 @@ gutenprint-intl.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ gutenprint-intl_8h #define @@ -1320,7 +1334,7 @@ gutenprint-module.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ gutenprint-module_8h gutenprint/gutenprint.h gutenprint/bit-ops.h @@ -1342,7 +1356,7 @@ gutenprint-version.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ gutenprint-version_8h #define @@ -1393,59 +1407,10 @@ ga13 (major, minor, micro) - - const char * - stp_check_version - group__version.html - ga6 - (unsigned int required_major, unsigned int required_minor, unsigned int required_micro) - - - const unsigned int - stp_major_version - group__version.html - ga0 - - - - const unsigned int - stp_minor_version - group__version.html - ga1 - - - - const unsigned int - stp_micro_version - group__version.html - ga2 - - - - const unsigned int - stp_current_interface - group__version.html - ga3 - - - - const unsigned int - stp_binary_age - group__version.html - ga4 - - - - const unsigned int - stp_interface_age - group__version.html - ga5 - - gutenprint.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ gutenprint_8h gutenprint/array.h gutenprint/curve.h @@ -1460,7 +1425,7 @@ image.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ image_8h stp_image @@ -1544,7 +1509,7 @@ list.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ list_8h stp_list_item @@ -1773,7 +1738,7 @@ module.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ module_8h gutenprint/list.h stp_module_version @@ -1867,7 +1832,7 @@ mxml.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ mxml_8h stp_mxml_attr_s stp_mxml_value_s @@ -2173,7 +2138,7 @@ paper.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ paper_8h gutenprint/vars.h stp_papersize_t @@ -2240,7 +2205,7 @@ path.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ path_8h stp_list_t * @@ -2259,7 +2224,7 @@ printers.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ printers_8h gutenprint/list.h gutenprint/vars.h @@ -2450,7 +2415,7 @@ sequence.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ sequence_8h stp_sequence @@ -2658,7 +2623,7 @@ string-list.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ string-list_8h stp_param_string_t @@ -2741,7 +2706,7 @@ util.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ util_8h gutenprint/curve.h gutenprint/vars.h @@ -3133,7 +3098,7 @@ vars.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ vars_8h gutenprint/array.h gutenprint/curve.h @@ -4239,7 +4204,7 @@ weave.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ weave_8h stp_weave_t stp_pass_t @@ -4426,7 +4391,7 @@ xml.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ xml_8h gutenprint/mxml.h @@ -8959,7 +8924,7 @@ include/gutenprint/ - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprint/ + /home/rlk/sandbox/print-4.3.x/include/gutenprint/ dir_000001.html array.h bit-ops.h @@ -8989,7 +8954,7 @@ include/ - /home/rleigh/gutenprint-5.0.0-rc1/include/ + /home/rlk/sandbox/print-4.3.x/include/ dir_000000.html

    include/gutenprint/ diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html index c53689d..602fe87 100644 --- a/doc/gutenprint/html/annotated.html +++ b/doc/gutenprint/html/annotated.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Structures - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    libgutenprint API Reference Data Structures

    Here are the data structures with brief descriptions: @@ -40,8 +40,8 @@
    dither_matrix_impl
    stp_shade
    stp_weave_t
    -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html index dcfacd7..4f178eb 100644 --- a/doc/gutenprint/html/array_8h.html +++ b/doc/gutenprint/html/array_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/array.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -54,8 +54,8 @@

    Detailed Description

    Array functions.

    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html index 379f26d..a3435e4 100644 --- a/doc/gutenprint/html/bit-ops_8h.html +++ b/doc/gutenprint/html/bit-ops_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/bit-ops.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -31,7 +31,7 @@ Bit operations.

    Function Documentation

    -

    +

    @@ -74,7 +74,7 @@ Bit operations.
    -

    +

    @@ -129,7 +129,7 @@ Bit operations.
    -

    +

    @@ -196,7 +196,7 @@ Bit operations.
    -

    +

    @@ -335,7 +335,7 @@ Bit operations.
    -

    +

    @@ -390,7 +390,7 @@ Bit operations.
    -

    +

    @@ -457,7 +457,7 @@ Bit operations.
    -

    +

    @@ -548,8 +548,8 @@ Bit operations.
    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html index 18ef67d..47be646 100644 --- a/doc/gutenprint/html/channel_8h.html +++ b/doc/gutenprint/html/channel_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/channel.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -48,20 +48,24 @@ const stp_curve_t * stp_channel_get_curve (stp_vars_t *v, int channel) -void stp_channel_initialize (stp_vars_t *v, stp_image_t *image, int input_channel_count) +void stp_channel_set_gcr_curve (stp_vars_t *v, const stp_curve_t *curve) -void stp_channel_convert (const stp_vars_t *v, unsigned *zero_mask) +const stp_curve_t * stp_channel_get_gcr_curve (stp_vars_t *v) -unsigned short * stp_channel_get_input (const stp_vars_t *v) +void stp_channel_initialize (stp_vars_t *v, stp_image_t *image, int input_channel_count) -unsigned short * stp_channel_get_output (const stp_vars_t *v) +void stp_channel_convert (const stp_vars_t *v, unsigned *zero_mask) + +unsigned short * stp_channel_get_input (const stp_vars_t *v) + +unsigned short * stp_channel_get_output (const stp_vars_t *v)

    Detailed Description

    Channel functions.

    Function Documentation

    -

    +

    @@ -110,7 +114,7 @@ Channel functions.
    -

    +

    @@ -147,7 +151,7 @@ Channel functions.
    -

    +

    @@ -175,7 +179,7 @@ Channel functions.
    -

    +

    @@ -212,7 +216,7 @@ Channel functions.
    -

    +

    @@ -255,7 +259,7 @@ Channel functions.
    -

    +

    @@ -298,7 +302,35 @@ Channel functions.
    -

    +

    + + + + +
    + + + + + + + + + +
    const stp_curve_t* stp_channel_get_gcr_curve ( stp_vars_t *  v  ) 
    +
    + + + + + +
    +   + + +

    +

    +

    @@ -326,7 +358,7 @@ Channel functions.
    -

    +

    @@ -354,7 +386,7 @@ Channel functions.
    -

    +

    @@ -382,7 +414,7 @@ Channel functions.
    -

    +

    @@ -410,7 +442,7 @@ Channel functions.
    -

    +

    @@ -438,7 +470,7 @@ Channel functions.
    -

    +

    @@ -481,7 +513,7 @@ Channel functions.
    -

    +

    @@ -524,7 +556,7 @@ Channel functions.
    -

    +

    @@ -552,7 +584,7 @@ Channel functions.
    -

    +

    @@ -589,7 +621,7 @@ Channel functions.
    -

    +

    @@ -626,7 +658,7 @@ Channel functions.
    -

    +

    @@ -669,7 +701,7 @@ Channel functions.
    -

    +

    @@ -718,7 +750,7 @@ Channel functions.
    -

    +

    @@ -767,7 +799,44 @@ Channel functions.
    -

    +

    + + + + +
    + + + + + + + + + + + + + + + + + + +
    void stp_channel_set_gcr_curve ( stp_vars_t *  v,
    const stp_curve_t *  curve
    ) 
    +
    + + + + + +
    +   + + +

    +

    +

    @@ -804,7 +873,7 @@ Channel functions.
    -

    +

    @@ -841,7 +910,7 @@ Channel functions.
    -

    +

    @@ -878,8 +947,8 @@ Channel functions.
    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html index f2ed916..151745a 100644 --- a/doc/gutenprint/html/classes.html +++ b/doc/gutenprint/html/classes.html @@ -3,15 +3,15 @@ libgutenprint API Reference: Alphabetical List - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    libgutenprint API Reference Data Structure Index

    D | S

      D  
    		stp_dither_matrix_generic   stp_int_bound_t   stp_module_version   stp_param_string_t   
    dither_matrix_impl   stp_dither_matrix_normal   stp_lineactive_t   stp_mxml_attr_s   stp_parameter_t   
      S  
    		stp_dither_matrix_short   stp_linebounds_t   stp_mxml_node_s   stp_pass_t   
    stp_cached_curve_t   stp_dotsize   stp_linebufs_t   stp_mxml_text_s   stp_printfuncs_t   
    stp_color   stp_double_bound_t   stp_linecount_t   stp_mxml_value_s   stp_raw_t   
    stp_colorfuncs_t   stp_family   stp_lineoff_t   stp_mxml_value_u   stp_shade   
    stp_curve_point_t   stp_image   stp_module   stp_papersize_t   stp_weave_t   

    D | S

    -

    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html index 6d31997..da294c2 100644 --- a/doc/gutenprint/html/color_8h.html +++ b/doc/gutenprint/html/color_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/color.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -53,8 +53,8 @@

    Detailed Description

    Color functions.

    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html index fb253d4..fc374cc 100644 --- a/doc/gutenprint/html/curve-cache_8h.html +++ b/doc/gutenprint/html/curve-cache_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/curve-cache.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -48,7 +48,7 @@ Curve caching functions.

    Define Documentation

    -

    +

    @@ -76,7 +76,7 @@ Curve caching functions.
    -

    +

    @@ -104,7 +104,7 @@ Curve caching functions.
    -

    +

    @@ -133,7 +133,7 @@ Curve caching functions.

    Function Documentation

    -

    +

    @@ -170,7 +170,7 @@ Curve caching functions.
    -

    +

    @@ -198,7 +198,7 @@ Curve caching functions.
    -

    +

    @@ -226,7 +226,7 @@ Curve caching functions.
    -

    +

    @@ -254,7 +254,7 @@ Curve caching functions.
    -

    +

    @@ -282,7 +282,7 @@ Curve caching functions.
    -

    +

    @@ -310,7 +310,7 @@ Curve caching functions.
    -

    +

    @@ -338,7 +338,7 @@ Curve caching functions.
    -

    +

    @@ -375,7 +375,7 @@ Curve caching functions.
    -

    +

    @@ -412,7 +412,7 @@ Curve caching functions.
    -

    +

    @@ -440,8 +440,8 @@ Curve caching functions.
    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html index a475f61..365e2a8 100644 --- a/doc/gutenprint/html/curve_8h.html +++ b/doc/gutenprint/html/curve_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/curve.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -186,8 +186,8 @@

    Detailed Description

    Curve functions.

    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html index 3547296..421b82e 100644 --- a/doc/gutenprint/html/deprecated.html +++ b/doc/gutenprint/html/deprecated.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Deprecated List - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    Deprecated List

    Global stp_get_printer_index_by_driver
    @@ -14,8 +14,8 @@
    Global stp_merge_printvars
    This is likely to go away.
    -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/dir_000000.html b/doc/gutenprint/html/dir_000000.html index d2fb987..a30a516 100644 --- a/doc/gutenprint/html/dir_000000.html +++ b/doc/gutenprint/html/dir_000000.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/ Directory Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include
    @@ -13,8 +13,8 @@ directory  gutenprint -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/dir_000001.html b/doc/gutenprint/html/dir_000001.html index aa75f63..e20220e 100644 --- a/doc/gutenprint/html/dir_000001.html +++ b/doc/gutenprint/html/dir_000001.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/ Directory Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -136,8 +136,8 @@

    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/dirs.html b/doc/gutenprint/html/dirs.html index 776d45f..8f440db 100644 --- a/doc/gutenprint/html/dirs.html +++ b/doc/gutenprint/html/dirs.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Directory Hierarchy - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    libgutenprint API Reference Directories

    This directory hierarchy is sorted roughly, but not completely, alphabetically: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html index fc8f3d1..a2b2caa 100644 --- a/doc/gutenprint/html/dither_8h.html +++ b/doc/gutenprint/html/dither_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/dither.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -116,7 +116,7 @@ Dither functions.

    Define Documentation

    -

    +

    @@ -139,7 +139,7 @@ Dither functions.
    -

    +

    @@ -162,7 +162,7 @@ Dither functions.
    -

    +

    @@ -185,7 +185,7 @@ Dither functions.
    -

    +

    @@ -208,7 +208,7 @@ Dither functions.
    -

    +

    @@ -232,7 +232,7 @@ Dither functions.

    Typedef Documentation

    -

    +

    @@ -255,7 +255,7 @@ Dither functions.
    -

    +

    @@ -278,7 +278,7 @@ Dither functions.
    -

    +

    @@ -301,7 +301,7 @@ Dither functions.
    -

    +

    @@ -324,7 +324,7 @@ Dither functions.
    -

    +

    @@ -347,7 +347,7 @@ Dither functions.
    -

    +

    @@ -371,7 +371,7 @@ Dither functions.

    Function Documentation

    -

    +

    @@ -426,7 +426,7 @@ Dither functions.
    -

    +

    @@ -475,7 +475,7 @@ Dither functions.
    -

    +

    @@ -518,7 +518,7 @@ Dither functions.
    -

    +

    @@ -561,7 +561,7 @@ Dither functions.
    -

    +

    @@ -604,7 +604,7 @@ Dither functions.
    -

    +

    @@ -647,7 +647,7 @@ Dither functions.
    -

    +

    @@ -702,7 +702,7 @@ Dither functions.
    -

    +

    @@ -763,7 +763,7 @@ Dither functions.
    -

    +

    @@ -791,7 +791,7 @@ Dither functions.
    -

    +

    @@ -840,7 +840,7 @@ Dither functions.
    -

    +

    @@ -877,7 +877,7 @@ Dither functions.
    -

    +

    @@ -905,7 +905,7 @@ Dither functions.
    -

    +

    @@ -966,7 +966,7 @@ Dither functions.
    -

    +

    @@ -1009,7 +1009,7 @@ Dither functions.
    -

    +

    @@ -1070,7 +1070,7 @@ Dither functions.
    -

    +

    @@ -1119,7 +1119,7 @@ Dither functions.
    -

    +

    @@ -1156,7 +1156,7 @@ Dither functions.
    -

    +

    @@ -1193,7 +1193,7 @@ Dither functions.
    -

    +

    @@ -1236,7 +1236,7 @@ Dither functions.
    -

    +

    @@ -1264,7 +1264,7 @@ Dither functions.
    -

    +

    @@ -1301,7 +1301,7 @@ Dither functions.
    -

    +

    @@ -1338,7 +1338,7 @@ Dither functions.
    -

    +

    @@ -1411,7 +1411,7 @@ Dither functions.
    -

    +

    @@ -1472,7 +1472,7 @@ Dither functions.
    -

    +

    @@ -1533,7 +1533,7 @@ Dither functions.
    -

    +

    @@ -1600,7 +1600,7 @@ Dither functions.
    -

    +

    @@ -1655,7 +1655,7 @@ Dither functions.
    -

    +

    @@ -1698,7 +1698,7 @@ Dither functions.
    -

    +

    @@ -1741,7 +1741,7 @@ Dither functions.
    -

    +

    @@ -1778,7 +1778,7 @@ Dither functions.
    -

    +

    @@ -1815,8 +1815,8 @@ Dither functions.
    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html index 1a64535..e3e4bc2 100644 --- a/doc/gutenprint/html/files.html +++ b/doc/gutenprint/html/files.html @@ -3,7 +3,7 @@ libgutenprint API Reference: File Index - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    libgutenprint API Reference File List

    Here is a list of all files with brief descriptions: @@ -32,8 +32,8 @@
    include/gutenprint/array.hArray functions
    include/gutenprint/weave.hSoftweave functions
    include/gutenprint/xml.hXML tree functions
    -
    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html index a6bd690..9359226 100644 --- a/doc/gutenprint/html/functions.html +++ b/doc/gutenprint/html/functions.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    All | Variables
    a | b | c | d | e | f | g | h | i | j | l | m | n | o | p | r | s | t | u | v | w | x | y
    @@ -170,8 +170,8 @@ Here is a list of all struct and union fields with links to the structures/union : stp_dither_matrix_generic, stp_dither_matrix_normal, stp_dither_matrix_short, stp_curve_point_t
  • y_offset : dither_matrix_impl
  • y_size : dither_matrix_impl -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/functions_rela.html b/doc/gutenprint/html/functions_rela.html new file mode 100644 index 0000000..a95b7e2 --- /dev/null +++ b/doc/gutenprint/html/functions_rela.html @@ -0,0 +1,16 @@ + + +libgutenprint API Reference: Data Fields - Related Functions + + + +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    +
    All | Variables
    + +

    + +

    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  + +doxygen 1.4.3
    + + diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html index c59740b..79531b7 100644 --- a/doc/gutenprint/html/functions_vars.html +++ b/doc/gutenprint/html/functions_vars.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - Variables - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    All | Variables
    a | b | c | d | e | f | g | h | i | j | l | m | n | o | p | r | s | t | u | v | w | x | y
    @@ -170,8 +170,8 @@ : stp_dither_matrix_generic, stp_dither_matrix_normal, stp_dither_matrix_short, stp_curve_point_t
  • y_offset : dither_matrix_impl
  • y_size : dither_matrix_impl -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html index 47b90f2..65929dc 100644 --- a/doc/gutenprint/html/globals.html +++ b/doc/gutenprint/html/globals.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    _ | b | c | d | g | n | p | s | t
    @@ -14,8 +14,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li

    - _ -

    -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html index db5ccc0..02f83a0 100644 --- a/doc/gutenprint/html/globals_0x62.html +++ b/doc/gutenprint/html/globals_0x62.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    | All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    _ | b | c | d | g | n | p | s | t
    @@ -14,8 +14,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li

    - b -

    -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html index 12956bd..70aed48 100644 --- a/doc/gutenprint/html/globals_0x63.html +++ b/doc/gutenprint/html/globals_0x63.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    | All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    _ | b | c | d | g | n | p | s | t
    @@ -17,8 +17,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : curve-cache.h
  • CURVE_CACHE_FAST_DOUBLE : curve-cache.h
  • CURVE_CACHE_FAST_USHORT : curve-cache.h -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html index 9ae3005..014cb68 100644 --- a/doc/gutenprint/html/globals_0x64.html +++ b/doc/gutenprint/html/globals_0x64.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    | All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    _ | b | c | d | g | n | p | s | t
    @@ -15,8 +15,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
  • dcgettext : gutenprint-intl.h, gutenprint-intl-internal.h
  • dgettext : gutenprint-intl.h, gutenprint-intl-internal.h -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html index 45fcf85..fd218b3 100644 --- a/doc/gutenprint/html/globals_0x67.html +++ b/doc/gutenprint/html/globals_0x67.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    | All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    _ | b | c | d | g | n | p | s | t
    @@ -14,8 +14,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li

    - g -

    -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html index 78d6f22..5fdd7de 100644 --- a/doc/gutenprint/html/globals_0x6e.html +++ b/doc/gutenprint/html/globals_0x6e.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    | All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    _ | b | c | d | g | n | p | s | t
    @@ -14,8 +14,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li

    - n -

    -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html index 58c68d7..fa96466 100644 --- a/doc/gutenprint/html/globals_0x70.html +++ b/doc/gutenprint/html/globals_0x70.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    | All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    _ | b | c | d | g | n | p | s | t
    @@ -20,8 +20,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : vars.h
  • PARAMETER_INACTIVE : vars.h
  • PARAMETER_OK : vars.h -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html index ce946cd..d18bba4 100644 --- a/doc/gutenprint/html/globals_0x73.html +++ b/doc/gutenprint/html/globals_0x73.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    | All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    _ | b | c | d | g | n | p | s | t
    @@ -33,25 +33,27 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : gutenprint-version.h
  • stp_catprintf() : util.h
  • stp_channel_add() : channel.h
  • stp_channel_convert() -: channel.h
  • stp_channel_get_black_channel() +: channel.h
  • stp_channel_get_black_channel() : channel.h
  • stp_channel_get_curve() : channel.h
  • stp_channel_get_cutoff_adjustment() : channel.h
  • stp_channel_get_density_adjustment() -: channel.h
  • stp_channel_get_gloss_channel() +: channel.h
  • stp_channel_get_gcr_curve() +: channel.h
  • stp_channel_get_gloss_channel() : channel.h
  • stp_channel_get_gloss_limit() : channel.h
  • stp_channel_get_ink_limit() : channel.h
  • stp_channel_get_input() -: channel.h
  • stp_channel_get_output() -: channel.h
  • stp_channel_get_value() +: channel.h
  • stp_channel_get_output() +: channel.h
  • stp_channel_get_value() : channel.h
  • stp_channel_initialize() -: channel.h
  • STP_CHANNEL_LIMIT +: channel.h
  • STP_CHANNEL_LIMIT : image.h
  • stp_channel_reset() : channel.h
  • stp_channel_reset_channel() : channel.h
  • stp_channel_set_black_channel() : channel.h
  • stp_channel_set_curve() : channel.h
  • stp_channel_set_cutoff_adjustment() : channel.h
  • stp_channel_set_density_adjustment() -: channel.h
  • stp_channel_set_gloss_channel() +: channel.h
  • stp_channel_set_gcr_curve() +: channel.h
  • stp_channel_set_gloss_channel() : channel.h
  • stp_channel_set_gloss_limit() : channel.h
  • stp_channel_set_ink_limit() : channel.h
  • stp_check_array_parameter() @@ -359,9 +361,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : weave.h
  • stp_merge_printvars() : vars.h
  • STP_MICRO_VERSION : gutenprint-version.h
  • stp_micro_version -: gutenprint-version.h
  • STP_MINOR_VERSION -: gutenprint-version.h
  • stp_minor_version -: gutenprint-version.h
  • STP_MODULE +: gutenprint-version.h
  • stp_minor_version +: gutenprint-version.h
  • STP_MINOR_VERSION +: gutenprint-version.h
  • STP_MODULE : gutenprint-module.h
  • STP_MODULE_CLASS_COLOR : module.h
  • STP_MODULE_CLASS_DITHER : module.h
  • STP_MODULE_CLASS_FAMILY @@ -637,8 +639,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : util.h
  • stp_zfwrite() : util.h
  • stp_zprintf() : util.h -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html index 103ecd1..31e6581 100644 --- a/doc/gutenprint/html/globals_0x74.html +++ b/doc/gutenprint/html/globals_0x74.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    | All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    _ | b | c | d | g | n | p | s | t
    @@ -14,8 +14,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li

    - t -

    -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html index 5f07189..e1979e4 100644 --- a/doc/gutenprint/html/globals_defs.html +++ b/doc/gutenprint/html/globals_defs.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    _ | b | c | d | g | n | s | t
    @@ -88,8 +88,8 @@

    - t -

    -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html index 9628de3..2aa7939 100644 --- a/doc/gutenprint/html/globals_enum.html +++ b/doc/gutenprint/html/globals_enum.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    @@ -24,8 +24,8 @@ : vars.h
  • stp_parameter_verify_t : vars.h
  • stp_weave_strategy_t : weave.h -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html index 99d4780..7c9a33b 100644 --- a/doc/gutenprint/html/globals_eval.html +++ b/doc/gutenprint/html/globals_eval.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    p | s
    @@ -76,8 +76,8 @@ : weave.h
  • STP_WEAVE_STAGGERED : weave.h
  • STP_WEAVE_ZIGZAG : weave.h -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html index aa8be08..20213cc 100644 --- a/doc/gutenprint/html/globals_func.html +++ b/doc/gutenprint/html/globals_func.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    s
    @@ -30,24 +30,26 @@ : util.h
  • stp_catprintf() : util.h
  • stp_channel_add() : channel.h
  • stp_channel_convert() -: channel.h
  • stp_channel_get_black_channel() +: channel.h
  • stp_channel_get_black_channel() : channel.h
  • stp_channel_get_curve() : channel.h
  • stp_channel_get_cutoff_adjustment() : channel.h
  • stp_channel_get_density_adjustment() -: channel.h
  • stp_channel_get_gloss_channel() +: channel.h
  • stp_channel_get_gcr_curve() +: channel.h
  • stp_channel_get_gloss_channel() : channel.h
  • stp_channel_get_gloss_limit() : channel.h
  • stp_channel_get_ink_limit() : channel.h
  • stp_channel_get_input() -: channel.h
  • stp_channel_get_output() -: channel.h
  • stp_channel_get_value() +: channel.h
  • stp_channel_get_output() +: channel.h
  • stp_channel_get_value() : channel.h
  • stp_channel_initialize() -: channel.h
  • stp_channel_reset() +: channel.h
  • stp_channel_reset() : channel.h
  • stp_channel_reset_channel() : channel.h
  • stp_channel_set_black_channel() : channel.h
  • stp_channel_set_curve() : channel.h
  • stp_channel_set_cutoff_adjustment() : channel.h
  • stp_channel_set_density_adjustment() -: channel.h
  • stp_channel_set_gloss_channel() +: channel.h
  • stp_channel_set_gcr_curve() +: channel.h
  • stp_channel_set_gloss_channel() : channel.h
  • stp_channel_set_gloss_limit() : channel.h
  • stp_channel_set_ink_limit() : channel.h
  • stp_check_array_parameter() @@ -467,8 +469,8 @@ : util.h
  • stp_zfwrite() : util.h
  • stp_zprintf() : util.h -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html index 9afd5bc..d330c51 100644 --- a/doc/gutenprint/html/globals_type.html +++ b/doc/gutenprint/html/globals_type.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    c | s
    @@ -55,8 +55,8 @@ : string-list.h
  • stp_vars_t : vars.h
  • stp_xml_parse_func : xml.h -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html index b32f0c1..e69d178 100644 --- a/doc/gutenprint/html/globals_vars.html +++ b/doc/gutenprint/html/globals_vars.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Data Fields - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    All | Functions | Variables | Typedefs | Enumerations | Enumerator | Defines
    @@ -22,8 +22,8 @@ : gutenprint-version.h
  • stp_pack_tiff : weave.h
  • stp_pack_uncompressed : weave.h -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html index f2c66ff..b9aa35e 100644 --- a/doc/gutenprint/html/group__array.html +++ b/doc/gutenprint/html/group__array.html @@ -3,7 +3,7 @@ libgutenprint API Reference: array - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    array

    The array is a simple "two-dimensional array of numbers" data structure. More... @@ -51,7 +51,7 @@ The array is a simple "two-dimensional array of numbers" data structure.

    array "inherits" from the sequence data structure (implemented via containment).

    Typedef Documentation

    -

    +

    @@ -77,7 +77,7 @@ The array opaque data type.

    Function Documentation

    -

    +

    @@ -122,7 +122,7 @@ Both dest and source must be valid arrays previously created with
    -

    +

    @@ -168,7 +168,7 @@ The total size of the array will be (x_size * y_size).
    Parame
    -

    +

    @@ -204,7 +204,7 @@ dest will be created, and then the contents of source will be copied into it. de
    -

    +

    @@ -239,7 +239,7 @@ It is an error to destroy the array more than once.
    Parameter
    -

    +

    @@ -295,7 +295,7 @@ Get the data in an array.
    -

    +

    @@ -355,7 +355,7 @@ Get the data at a single point in the array.
    -

    +

    @@ -391,7 +391,7 @@ Get the underlying stp_sequence_t.
    -

    +

    @@ -443,7 +443,7 @@ The current x and y sizes are stored in the integers pointed to by x_size and y_
    -

    +

    @@ -488,7 +488,7 @@ Set the data in an array.
    -

    +

    @@ -548,7 +548,7 @@ Set the data at a single point in the array.
    -

    +

    @@ -600,8 +600,8 @@ Resizing an array will destroy all data stored in the array.
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html index 5317f9d..7d007af 100644 --- a/doc/gutenprint/html/group__color.html +++ b/doc/gutenprint/html/group__color.html @@ -3,7 +3,7 @@ libgutenprint API Reference: color - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    color

    The color data type is responsible for providing colour conversion features. More... @@ -51,7 +51,7 @@ The color data type is responsible for providing colour conversion features.

    Color modules provide the actual functionality, so different colour management modules may provide the application with different services (for example, colour profiles).

    Typedef Documentation

    -

    +

    @@ -75,7 +75,7 @@ Color modules provide the actual functionality, so different colour management m

    Function Documentation

    -

    +

    @@ -106,7 +106,7 @@ Get the number of available color modules.
    -

    +

    @@ -149,7 +149,7 @@ Get the number of available color modules.
    -

    +

    @@ -185,7 +185,7 @@ Get the long (translated) name of a color module.
    -

    +

    @@ -221,7 +221,7 @@ Get the short (untranslated) name of a color module.
    -

    +

    @@ -270,7 +270,7 @@ Get the short (untranslated) name of a color module.
    -

    +

    @@ -313,7 +313,7 @@ Get the short (untranslated) name of a color module.
    -

    +

    @@ -341,7 +341,7 @@ Get the short (untranslated) name of a color module.
    -

    +

    @@ -369,7 +369,7 @@ Get the short (untranslated) name of a color module.
    -

    +

    @@ -397,7 +397,7 @@ Get the short (untranslated) name of a color module.
    -

    +

    @@ -425,7 +425,7 @@ Get the short (untranslated) name of a color module.
    -

    +

    @@ -461,7 +461,7 @@ Get a color module by its index number.
    -

    +

    @@ -497,8 +497,8 @@ Get a color module by its name.
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html index 25b60cc..7882aa4 100644 --- a/doc/gutenprint/html/group__curve.html +++ b/doc/gutenprint/html/group__curve.html @@ -3,7 +3,7 @@ libgutenprint API Reference: curve - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    curve

    The curve type models a linear, spline or gamma curve. More... @@ -182,7 +182,7 @@ The curve type models a linear, spline or gamma curve.

    curve "inherits" from the sequence data structure (implemented via containment), since the curve data is represented internally as a sequence of numbers, for linear and spline curves. Linear Piecewise Curves (LPCs) should be implemented in the future which represent a curve in a more compact format.

    Various operations are supported, including interpolation and composition.

    Typedef Documentation

    -

    +

    @@ -208,7 +208,7 @@ The curve opaque data type.

    Enumeration Type Documentation

    -

    +

    @@ -232,18 +232,18 @@ Behaviour when curve exceeds bounds.

    Enumerator:
    - - -
    STP_CURVE_BOUNDS_RESCALE  +
    STP_CURVE_BOUNDS_RESCALE  Rescale the bounds.
    STP_CURVE_BOUNDS_CLIP  +
    STP_CURVE_BOUNDS_CLIP  Clip the curve to the existing bounds.
    STP_CURVE_BOUNDS_ERROR  +
    STP_CURVE_BOUNDS_ERROR  Error if bounds are violated.
    -

    +

    @@ -267,18 +267,18 @@ Composition types.

    Enumerator:
    - - -
    STP_CURVE_COMPOSE_ADD  +
    STP_CURVE_COMPOSE_ADD  Add composition.
    STP_CURVE_COMPOSE_MULTIPLY  +
    STP_CURVE_COMPOSE_MULTIPLY  Multiply composition.
    STP_CURVE_COMPOSE_EXPONENTIATE  +
    STP_CURVE_COMPOSE_EXPONENTIATE  Exponentiate composition.
    -

    +

    @@ -302,16 +302,16 @@ Curve types.

    Enumerator:
    - -
    STP_CURVE_TYPE_LINEAR  +
    STP_CURVE_TYPE_LINEAR  Linear interpolation.
    STP_CURVE_TYPE_SPLINE  +
    STP_CURVE_TYPE_SPLINE  Spline interpolation.
    -

    +

    @@ -335,9 +335,9 @@ Wrapping mode.

    Enumerator:
    - -
    STP_CURVE_WRAP_NONE  +
    STP_CURVE_WRAP_NONE  The curve does not wrap.
    STP_CURVE_WRAP_AROUND  +
    STP_CURVE_WRAP_AROUND  The curve wraps to its starting point.
    @@ -345,7 +345,7 @@ The curve wraps to its starting point.

    Function Documentation

    -

    +

    @@ -412,7 +412,7 @@ Only add and multiply composition is currently supported. If both curves are gam
    -

    +

    @@ -457,7 +457,7 @@ Both dest and source must be valid curves previously created with
    -

    +

    @@ -493,7 +493,7 @@ Get the number of allocated points in the curve.
    -

    +

    @@ -530,7 +530,7 @@ A wrapped curve has the same value at x=0 and x=1. The wrap mode of a curve cann
    -

    +

    @@ -566,7 +566,7 @@ dest will be created, and then the contents of source will be copied into it. de
    -

    +

    @@ -603,7 +603,7 @@ Create a curve from a stream.
    -

    +

    @@ -640,7 +640,7 @@ Create a curve from a stream.
    -

    +

    @@ -677,7 +677,7 @@ Create a curve from a string.
    -

    +

    @@ -712,7 +712,7 @@ It is an error to destroy the curve more than once.
    Parameter
    -

    +

    @@ -764,7 +764,7 @@ Get the lower and upper bounds on a curve.
    -

    +

    @@ -810,7 +810,7 @@ Get a pointer to the curve's raw data.
    -

    +

    @@ -856,7 +856,7 @@ Get a pointer to the curve's raw data as points.
    -

    +

    @@ -902,7 +902,7 @@ Get pointer to the curve's raw data as floats.
    -

    +

    @@ -933,7 +933,7 @@ Get the gamma value of the curve.
    -

    +

    @@ -979,7 +979,7 @@ Get pointer to the curve's raw data as integers.
    -

    +

    @@ -1015,7 +1015,7 @@ Get the curve interpolation type.
    -

    +

    @@ -1061,7 +1061,7 @@ Get pointer to the curve's raw data as longs.
    -

    +

    @@ -1114,7 +1114,7 @@ Get a point along the curve.
    -

    +

    @@ -1157,7 +1157,7 @@ Get a point along the curve.
    -

    +

    @@ -1193,7 +1193,7 @@ This can be used for fast access to the raw data.
    Parameters:
    -

    +

    @@ -1239,7 +1239,7 @@ Get pointer to the curve's raw data as shorts.
    -

    +

    @@ -1292,7 +1292,7 @@ If the start or count is invalid, the returned curve will compare equal to NULL
    -

    +

    @@ -1338,7 +1338,7 @@ Get pointer to the curve's raw data as unsigned integers.
    -

    +

    @@ -1384,7 +1384,7 @@ Get pointer to the curve's raw data as unsigned longs.
    -

    +

    @@ -1430,7 +1430,7 @@ Get pointer to the curve's raw data as unsigned shorts.
    -

    +

    @@ -1466,7 +1466,7 @@ Get the wrapping mode.
    -

    +

    @@ -1519,7 +1519,7 @@ Interpolate a point along the curve.
    -

    +

    @@ -1555,7 +1555,7 @@ Determine whether the curve is piecewise.
    -

    +

    @@ -1601,7 +1601,7 @@ This does not destroy the gamma value of a curve. Points are interpolated as req
    -

    +

    @@ -1661,7 +1661,7 @@ This also rescales the bounds. Note that this currently destroys the gamma prope
    -

    +

    @@ -1714,7 +1714,7 @@ To change the bounds adjusting data as required, use stp_curve_rescale instead.
    -

    +

    @@ -1767,7 +1767,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    -

    +

    @@ -1820,7 +1820,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    -

    +

    @@ -1873,7 +1873,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    -

    +

    @@ -1919,7 +1919,7 @@ This replaces all existing points along the curve. The bounds are set to 0..1. I
    -

    +

    @@ -1972,7 +1972,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    -

    +

    @@ -2018,7 +2018,7 @@ Set the curve interpolation type.
    -

    +

    @@ -2071,7 +2071,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    -

    +

    @@ -2124,7 +2124,7 @@ This call destroys any gamma value assigned to the curve.
    Par
    -

    +

    @@ -2177,7 +2177,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    -

    +

    @@ -2220,7 +2220,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    -

    +

    @@ -2273,7 +2273,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    -

    +

    @@ -2326,7 +2326,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    -

    +

    @@ -2379,7 +2379,7 @@ If any of the data points fall outside the bounds, the operation is not performe
    -

    +

    @@ -2426,7 +2426,7 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
    -

    +

    @@ -2463,8 +2463,8 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html index 99cb917..3e19078 100644 --- a/doc/gutenprint/html/group__image.html +++ b/doc/gutenprint/html/group__image.html @@ -3,7 +3,7 @@ libgutenprint API Reference: image - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    image

    The image type is an abstract data type for interfacing with the image creation program. More... @@ -45,7 +45,7 @@ The image type is an abstract data type for interfacing with the image creation program.

    Define Documentation

    -

    +

    @@ -69,7 +69,7 @@ The maximum number of channels.

    Typedef Documentation

    -

    +

    @@ -95,7 +95,7 @@ It provides callbacks to functions defined within the client application which a

    Enumeration Type Documentation

    -

    +

    @@ -119,9 +119,9 @@ Image status.

    Enumerator:
    - -
    STP_IMAGE_STATUS_OK  +
    STP_IMAGE_STATUS_OK  Everything is OK.
    STP_IMAGE_STATUS_ABORT  +
    STP_IMAGE_STATUS_ABORT  An error occured, or the job was aborted.
    @@ -129,7 +129,7 @@ An error occured, or the job was aborted.

    Function Documentation

    -

    +

    @@ -157,7 +157,7 @@ An error occured, or the job was aborted.
    -

    +

    @@ -185,7 +185,7 @@ An error occured, or the job was aborted.
    -

    +

    @@ -234,7 +234,7 @@ An error occured, or the job was aborted.
    -

    +

    @@ -262,7 +262,7 @@ An error occured, or the job was aborted.
    -

    +

    @@ -290,7 +290,7 @@ An error occured, or the job was aborted.
    -

    +

    @@ -318,7 +318,7 @@ An error occured, or the job was aborted.
    -

    +

    @@ -346,8 +346,8 @@ An error occured, or the job was aborted.
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html index f650ade..4a087cc 100644 --- a/doc/gutenprint/html/group__intl.html +++ b/doc/gutenprint/html/group__intl.html @@ -3,7 +3,7 @@ libgutenprint API Reference: intl - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    intl

    Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language. More... @@ -28,7 +28,7 @@ Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language.

    The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems).

    Define Documentation

    -

    +

    @@ -56,7 +56,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -87,7 +87,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -121,7 +121,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -152,7 +152,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -180,7 +180,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -208,7 +208,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -236,8 +236,8 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html index 44e56ad..e7df922 100644 --- a/doc/gutenprint/html/group__intl__internal.html +++ b/doc/gutenprint/html/group__intl__internal.html @@ -3,7 +3,7 @@ libgutenprint API Reference: intl-internal - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    intl-internal

    Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language. More... @@ -28,7 +28,7 @@ Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language.

    The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems). They differ from the normal intl functions in that the textdomain is fixed, for use by functions internal to Gimp-Print. This header should not be included by source files outside the gimp-print source tree.

    Define Documentation

    -

    +

    @@ -56,7 +56,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -87,7 +87,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -121,7 +121,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -152,7 +152,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -180,7 +180,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -208,7 +208,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    +

    @@ -236,8 +236,8 @@ The macros defined in this header are convenience wrappers around the gettext fu
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html index 7571931..4005841 100644 --- a/doc/gutenprint/html/group__list.html +++ b/doc/gutenprint/html/group__list.html @@ -3,7 +3,7 @@ libgutenprint API Reference: list - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    list

    The list data type implements a fast generic doubly-linked list. More... @@ -111,7 +111,7 @@ The list data type implements a fast generic doubly-linked list.

    It supports all of the operations you might want in a list (insert, remove, iterate over the list, copy whole lists), plus some (optional) less common features: finding items by index, name or long name, and sorting. These should also be fairly fast, due to caching in the list head.

    Typedef Documentation

    -

    +

    @@ -136,7 +136,7 @@ The list item opaque data type. This object is a node in the list.
    -

    +

    @@ -161,7 +161,7 @@ The list opaque data type. This object represents the list as a whole.
    -

    +

    @@ -186,7 +186,7 @@ A callback function to copy the data a node contains. The parameter is a pointer to the node data. The return value is a pointer to the new copy of the data.
    -

    +

    @@ -211,7 +211,7 @@ A callback function to free the data a node contains. The parameter is a pointer to the node data.
    -

    +

    @@ -236,7 +236,7 @@ A callback function to get the name of a node. The parameter is a pointer to the node data. The return value is a pointer to the name of the node, or NULL if there is no name.
    -

    +

    @@ -262,7 +262,7 @@ The two parameters are pointers to node data. The return value is <0 if the f

    Function Documentation

    -

    +

    @@ -298,7 +298,7 @@ list must be a valid list object previously created with

    +

    @@ -329,7 +329,7 @@ Create a new list object.
    -

    +

    @@ -365,7 +365,7 @@ It is an error to destroy the list more than once.
    Parameters
    -

    +

    @@ -401,7 +401,7 @@ Get a list node copy function.
    -

    +

    @@ -437,7 +437,7 @@ Find the last item in a list.
    -

    +

    @@ -473,7 +473,7 @@ Get a list node free function.
    -

    +

    @@ -519,7 +519,7 @@ Find an item in a list by its index.
    -

    +

    @@ -565,7 +565,7 @@ Find an item in a list by its long name.
    -

    +

    @@ -611,7 +611,7 @@ Find an item in a list by its name.
    -

    +

    @@ -647,7 +647,7 @@ Get the length of a list.
    -

    +

    @@ -683,7 +683,7 @@ Get a list node long name function.
    -

    +

    @@ -719,7 +719,7 @@ Get a list node name function.
    -

    +

    @@ -755,7 +755,7 @@ Get a list node sort function.
    -

    +

    @@ -791,7 +791,7 @@ Find the first item in a list.
    -

    +

    @@ -844,7 +844,7 @@ Create a new list item.
    -

    +

    @@ -890,7 +890,7 @@ Destroy a list item.
    -

    +

    @@ -926,7 +926,7 @@ Get the data associated with a list item.
    -

    +

    @@ -962,7 +962,7 @@ Get the next item in the list.
    -

    +

    @@ -998,7 +998,7 @@ Get the previous item in the list.
    -

    +

    @@ -1045,7 +1045,7 @@ Set the data associated with a list item.
    -

    +

    @@ -1080,7 +1080,7 @@ This function is indended for use as an stp_node_freefunc, which uses stp_free t
    -

    +

    @@ -1125,7 +1125,7 @@ This callback function will be called whenever a list item is copied. Its intend
    -

    +

    @@ -1170,7 +1170,7 @@ This callback function will be called whenever a list item is destroyed. Its int
    -

    +

    @@ -1215,7 +1215,7 @@ This callback function will be called whenever the long name of a list item need
    -

    +

    @@ -1260,7 +1260,7 @@ This callback function will be called whenever the name of a list item needs to
    -

    +

    @@ -1305,8 +1305,8 @@ This callback function will be called to determine the sort order for list items
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html index f8c424f..5e5ce88 100644 --- a/doc/gutenprint/html/group__papersize.html +++ b/doc/gutenprint/html/group__papersize.html @@ -3,7 +3,7 @@ libgutenprint API Reference: papersize - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    papersize

    The papersize describes the dimensions of a paper. More... @@ -40,7 +40,7 @@ The papersize describes the dimensions of a paper.

    Enumeration Type Documentation

    -

    +

    @@ -64,13 +64,13 @@ Units of measurement.

    Enumerator:
    - - - -
    PAPERSIZE_ENGLISH_STANDARD  +
    PAPERSIZE_ENGLISH_STANDARD  English/Imperial units.
    PAPERSIZE_METRIC_STANDARD  +
    PAPERSIZE_METRIC_STANDARD  Metric units.
    PAPERSIZE_ENGLISH_EXTENDED  +
    PAPERSIZE_ENGLISH_EXTENDED  English/Imperial units (optional paper, not displayed by default).
    PAPERSIZE_METRIC_EXTENDED  +
    PAPERSIZE_METRIC_EXTENDED  Metric units (optional paper, not displayed by default).
    @@ -78,7 +78,7 @@ Metric units (optional paper, not displayed by default).

    Function Documentation

    -

    +

    @@ -121,7 +121,7 @@ Metric units (optional paper, not displayed by default).
    -

    +

    @@ -157,7 +157,7 @@ Get a papersize by its index number.
    -

    +

    @@ -193,7 +193,7 @@ Get a papersize by name.
    -

    +

    @@ -239,7 +239,7 @@ The nearest available size to the size requested will be found.
    -

    +

    @@ -270,8 +270,8 @@ Get the number of available papersizes.
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html index 4337c79..8b0618e 100644 --- a/doc/gutenprint/html/group__printer.html +++ b/doc/gutenprint/html/group__printer.html @@ -3,7 +3,7 @@ libgutenprint API Reference: printer - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    printer

    The printer type represents a printer model. More... @@ -89,7 +89,7 @@ The printer type represents a printer model.

    A particular printer model must selected in order to be able to print. Each printer model provides default print options through a default vars object.

    Typedef Documentation

    -

    +

    @@ -112,7 +112,7 @@ A particular printer model must selected in order to be able to print. Each prin
    -

    +

    @@ -138,7 +138,7 @@ The printer opaque data type (representation of printer model).

    Function Documentation

    -

    +

    @@ -166,7 +166,7 @@ The printer opaque data type (representation of printer model).
    -

    +

    @@ -212,7 +212,7 @@ End a print job.
    -

    +

    @@ -240,7 +240,7 @@ End a print job.
    -

    +

    @@ -268,7 +268,7 @@ End a print job.
    -

    +

    @@ -296,7 +296,7 @@ End a print job.
    -

    +

    @@ -332,7 +332,7 @@ Get the printer model from a vars object.
    -

    +

    @@ -368,7 +368,7 @@ Get a printer model by its short name.
    -

    +

    @@ -404,7 +404,7 @@ Get a printer model by its index number.
    -

    +

    @@ -440,7 +440,7 @@ Get a printer model by its long (translated) name.
    -

    +

    @@ -477,7 +477,7 @@ Get the printer index number from the printer model short (driver) name.
    -

    +

    @@ -505,7 +505,7 @@ Get the printer index number from the printer model short (driver) name.
    -

    +

    @@ -552,7 +552,7 @@ Print the image.
    -

    +

    @@ -595,7 +595,7 @@ Print the image.
    -

    +

    @@ -631,7 +631,7 @@ The default vars should be copied to a new vars object and customised prior to p
    -

    +

    @@ -667,7 +667,7 @@ Get a printer model's short (driver) name.
    -

    +

    @@ -703,7 +703,7 @@ The family name is the name of the modular "family" driver this model uses.
    -

    +

    @@ -739,7 +739,7 @@ Get a printer model's long (translated) name.
    -

    +

    @@ -775,7 +775,7 @@ Get a printer model's manufacturer's name.
    -

    +

    @@ -811,7 +811,7 @@ The model number is used internally by the "family" driver module, and has no me
    -

    +

    @@ -839,7 +839,7 @@ The model number is used internally by the "family" driver module, and has no me
    -

    +

    @@ -870,7 +870,7 @@ Get the number of available printer models.
    -

    +

    @@ -915,7 +915,7 @@ Set a vars object to use a particular driver, and set the parameter to its defau
    -

    +

    @@ -962,7 +962,7 @@ Start a print job.
    -

    +

    @@ -990,8 +990,8 @@ Start a print job.
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html index be7fade..598500d 100644 --- a/doc/gutenprint/html/group__sequence.html +++ b/doc/gutenprint/html/group__sequence.html @@ -3,7 +3,7 @@ libgutenprint API Reference: sequence - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    sequence

    The sequence is a simple "vector of numbers" data structure. More... @@ -102,7 +102,7 @@ The sequence is a simple "vector of numbers" data structure.

    Typedef Documentation

    -

    +

    @@ -128,7 +128,7 @@ The sequence opaque data type.

    Function Documentation

    -

    +

    @@ -173,7 +173,7 @@ Both dest and source must be valid sequences previously created with

    +

    @@ -204,7 +204,7 @@ Create a new sequence.
    -

    +

    @@ -240,7 +240,7 @@ A new sequence will be created, and then the contents of source will be copied i
    -

    +

    @@ -275,7 +275,7 @@ It is an error to destroy the sequence more than once.
    Parame
    -

    +

    @@ -327,7 +327,7 @@ The values are stored in the variables pointed to by low and high.
    <
    -

    +

    @@ -383,7 +383,7 @@ Get the data in a sequence.
    -

    +

    @@ -429,7 +429,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    -

    +

    @@ -475,7 +475,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    -

    +

    @@ -521,7 +521,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    -

    +

    @@ -574,7 +574,7 @@ Get the data at a single point in a sequence.
    -

    +

    @@ -626,7 +626,7 @@ The values are stored in the variables pointed to by low and high.
    <
    -

    +

    @@ -672,7 +672,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    -

    +

    @@ -703,7 +703,7 @@ Get the sequence size.
    -

    +

    @@ -749,7 +749,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    -

    +

    @@ -795,7 +795,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    -

    +

    @@ -841,7 +841,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    -

    +

    @@ -894,7 +894,7 @@ The lower and upper bounds set the minimum and maximum values that a point in th
    -

    +

    @@ -947,7 +947,7 @@ Set the data in a sequence.
    -

    +

    @@ -1000,7 +1000,7 @@ Set the data in a sequence from float values.
    -

    +

    @@ -1053,7 +1053,7 @@ Set the data in a sequence from int values.
    -

    +

    @@ -1106,7 +1106,7 @@ Set the data in a sequence from long values.
    -

    +

    @@ -1159,7 +1159,7 @@ Set the data at a single point in a sequence.
    -

    +

    @@ -1212,7 +1212,7 @@ Set the data in a sequence from short values.
    -

    +

    @@ -1258,7 +1258,7 @@ The size is the number of elements the sequence contains. Note that resizing wil
    -

    +

    @@ -1318,7 +1318,7 @@ Set the data in a subrange of a sequence.
    -

    +

    @@ -1371,7 +1371,7 @@ Set the data in a sequence from unsigned int values.
    -

    +

    @@ -1424,7 +1424,7 @@ Set the data in a sequence from unsigned long values.
    -

    +

    @@ -1477,8 +1477,8 @@ Set the data in a sequence from unsigned short values.
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html index 6f80d0a..5929501 100644 --- a/doc/gutenprint/html/group__util.html +++ b/doc/gutenprint/html/group__util.html @@ -3,7 +3,7 @@ libgutenprint API Reference: util - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    util

    Utility functions. More... @@ -129,7 +129,7 @@ Utility functions.

    Define Documentation

    -

    +

    @@ -152,7 +152,7 @@ Utility functions.
    -

    +

    @@ -175,7 +175,7 @@ Utility functions.
    -

    +

    @@ -198,7 +198,7 @@ Utility functions.
    -

    +

    @@ -221,7 +221,7 @@ Utility functions.
    -

    +

    @@ -244,7 +244,7 @@ Utility functions.
    -

    +

    @@ -267,7 +267,7 @@ Utility functions.
    -

    +

    @@ -290,7 +290,7 @@ Utility functions.
    -

    +

    @@ -313,7 +313,7 @@ Utility functions.
    -

    +

    @@ -336,7 +336,7 @@ Utility functions.
    -

    +

    @@ -359,7 +359,7 @@ Utility functions.
    -

    +

    @@ -382,7 +382,7 @@ Utility functions.
    -

    +

    @@ -405,7 +405,7 @@ Utility functions.
    -

    +

    @@ -428,7 +428,7 @@ Utility functions.
    -

    +

    @@ -451,7 +451,7 @@ Utility functions.
    -

    +

    @@ -474,7 +474,7 @@ Utility functions.
    -

    +

    @@ -497,7 +497,7 @@ Utility functions.
    -

    +

    @@ -520,7 +520,7 @@ Utility functions.
    -

    +

    @@ -543,7 +543,7 @@ Utility functions.
    -

    +

    @@ -566,7 +566,7 @@ Utility functions.
    -

    +

    @@ -589,7 +589,7 @@ Utility functions.
    -

    +

    @@ -612,7 +612,7 @@ Utility functions.
    -

    +

    @@ -647,7 +647,7 @@ Utility functions.

    Function Documentation

    -

    +

    @@ -675,7 +675,7 @@ Utility functions.
    -

    +

    @@ -718,7 +718,7 @@ Utility functions.
    -

    +

    @@ -761,7 +761,7 @@ Utility functions.
    -

    +

    @@ -804,7 +804,7 @@ Utility functions.
    -

    +

    @@ -853,7 +853,7 @@ Utility functions.
    -

    +

    @@ -896,7 +896,7 @@ Utility functions.
    -

    +

    @@ -933,7 +933,7 @@ Utility functions.
    -

    +

    @@ -961,7 +961,7 @@ Utility functions.
    -

    +

    @@ -989,7 +989,7 @@ Utility functions.
    -

    +

    @@ -1017,7 +1017,7 @@ Utility functions.
    -

    +

    @@ -1045,7 +1045,7 @@ Utility functions.
    -

    +

    @@ -1076,7 +1076,7 @@ Get the library release version string (x.y).
    -

    +

    @@ -1107,7 +1107,7 @@ Get the library version string (x.y.z).
    -

    +

    @@ -1138,7 +1138,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1166,7 +1166,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1194,7 +1194,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1222,7 +1222,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1259,7 +1259,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1296,7 +1296,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1333,7 +1333,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1370,7 +1370,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1407,7 +1407,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1444,7 +1444,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1493,7 +1493,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1530,7 +1530,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1579,7 +1579,7 @@ This function must be called prior to any other use of the library. It is respon
    -

    +

    @@ -1615,7 +1615,7 @@ This function sets the encoding that all strings translated by gettext are outpu
    -

    +

    @@ -1643,7 +1643,7 @@ This function sets the encoding that all strings translated by gettext are outpu
    -

    +

    @@ -1671,7 +1671,7 @@ This function sets the encoding that all strings translated by gettext are outpu
    -

    +

    @@ -1708,7 +1708,7 @@ This function sets the encoding that all strings translated by gettext are outpu
    -

    +

    @@ -1736,7 +1736,7 @@ This function sets the encoding that all strings translated by gettext are outpu
    -

    +

    @@ -1785,7 +1785,7 @@ This function sets the encoding that all strings translated by gettext are outpu
    -

    +

    @@ -1828,8 +1828,8 @@ This function sets the encoding that all strings translated by gettext are outpu
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html index 468533e..8431084 100644 --- a/doc/gutenprint/html/group__vars.html +++ b/doc/gutenprint/html/group__vars.html @@ -3,7 +3,7 @@ libgutenprint API Reference: vars - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    vars

    The vars data type contains all the information about a print job, this includes information such as the printer model, paper size, print resolution etc. More... @@ -466,7 +466,7 @@ The vars data type contains all the information about a print job, this includes

    Most of these job options are expressed as parameters which vary according to the model and other options selected.

    The representation of printer settings has changed dramatically from 4.2. All (well most, anyway) settings outside of basics such as the printer model and sizing settings are now typed parameters.

    Typedef Documentation

    -

    +

    @@ -489,7 +489,7 @@ The representation of printer settings has changed dramatically from 4.2. All (w
    -

    +

    @@ -514,7 +514,7 @@ The constant parameter_list opaque data type.
    -

    +

    @@ -537,7 +537,7 @@ The constant parameter_list opaque data type.
    -

    +

    @@ -560,7 +560,7 @@ The constant parameter_list opaque data type.
    -

    +

    @@ -592,7 +592,7 @@ There are two output functions supplied by the caller, one to send output data a
    -

    +

    @@ -617,7 +617,7 @@ The parameter_list opaque data type.
    -

    +

    @@ -643,7 +643,7 @@ The vars opaque data type.

    Enumeration Type Documentation

    -

    +

    @@ -667,18 +667,18 @@ Parameter activity.

    Whether a parameter is currently active (i. e. whether its value should be used by the driver or not). All parameters default to being active unless explicitly "turned off".

    Enumerator:
    - - -
    STP_PARAMETER_INACTIVE  +
    STP_PARAMETER_INACTIVE  Parameter is inactive (unused).
    STP_PARAMETER_DEFAULTED  +
    STP_PARAMETER_DEFAULTED  Parameter is set to its default value.
    STP_PARAMETER_ACTIVE  +
    STP_PARAMETER_ACTIVE  Parameter is active (used).
    -

    +

    @@ -702,20 +702,20 @@ Parameter class.

    What kind of setting this is, for the purpose of user interface representation.

    Enumerator:
    - - - -
    STP_PARAMETER_CLASS_FEATURE  +
    STP_PARAMETER_CLASS_FEATURE  Printer feature.
    STP_PARAMETER_CLASS_OUTPUT  +
    STP_PARAMETER_CLASS_OUTPUT  Output control.
    STP_PARAMETER_CLASS_CORE  +
    STP_PARAMETER_CLASS_CORE  Core Gimp-Print parameter.
    STP_PARAMETER_CLASS_INVALID  +
    STP_PARAMETER_CLASS_INVALID  Invalid class (should never be used).
    -

    +

    @@ -739,30 +739,30 @@ Parameter level.

    What "level" a setting is at, for UI design.

    Enumerator:
    - - - - - - - - -
    STP_PARAMETER_LEVEL_BASIC  +
    STP_PARAMETER_LEVEL_BASIC  Basic parameter, shown by all UIs.
    STP_PARAMETER_LEVEL_ADVANCED  +
    STP_PARAMETER_LEVEL_ADVANCED  Advanced parameter, shown by advanced UIs.
    STP_PARAMETER_LEVEL_ADVANCED1  +
    STP_PARAMETER_LEVEL_ADVANCED1  Advanced1 parameter, shown by advanced UIs.
    STP_PARAMETER_LEVEL_ADVANCED2  +
    STP_PARAMETER_LEVEL_ADVANCED2  Advanced2 parameter, shown by advanced UIs.
    STP_PARAMETER_LEVEL_ADVANCED3  +
    STP_PARAMETER_LEVEL_ADVANCED3  Advanced3 parameter, shown by advanced UIs.
    STP_PARAMETER_LEVEL_ADVANCED4  +
    STP_PARAMETER_LEVEL_ADVANCED4  Advanced4 parameter, shown by advanced UIs.
    STP_PARAMETER_LEVEL_INTERNAL  +
    STP_PARAMETER_LEVEL_INTERNAL  Parameters used only within Gimp-Print.
    STP_PARAMETER_LEVEL_EXTERNAL  +
    STP_PARAMETER_LEVEL_EXTERNAL  Parameters used only outside Gimp-Print.
    STP_PARAMETER_LEVEL_INVALID  +
    STP_PARAMETER_LEVEL_INVALID  Invalid level (should never be used).
    -

    +

    @@ -786,32 +786,32 @@ Parameter types.

    The following types are permitted for a printer setting. Not all are currently implemented.

    Enumerator:
    - - - - - - - - - -
    STP_PARAMETER_TYPE_STRING_LIST  +
    STP_PARAMETER_TYPE_STRING_LIST  Single string choice from a list.
    STP_PARAMETER_TYPE_INT  +
    STP_PARAMETER_TYPE_INT  Integer.
    STP_PARAMETER_TYPE_BOOLEAN  +
    STP_PARAMETER_TYPE_BOOLEAN  Boolean.
    STP_PARAMETER_TYPE_DOUBLE  +
    STP_PARAMETER_TYPE_DOUBLE  Floating point number.
    STP_PARAMETER_TYPE_CURVE  +
    STP_PARAMETER_TYPE_CURVE  Curve.
    STP_PARAMETER_TYPE_FILE  +
    STP_PARAMETER_TYPE_FILE  Filename (NYI, need to consider security).
    STP_PARAMETER_TYPE_RAW  +
    STP_PARAMETER_TYPE_RAW  Raw, opaque data.
    STP_PARAMETER_TYPE_ARRAY  +
    STP_PARAMETER_TYPE_ARRAY  Array.
    STP_PARAMETER_TYPE_DIMENSION  +
    STP_PARAMETER_TYPE_DIMENSION  Linear dimension.
    STP_PARAMETER_TYPE_INVALID  +
    STP_PARAMETER_TYPE_INVALID  Invalid type (should never be used).
    -

    +

    Enumerator:
    @@ -833,11 +833,11 @@ Invalid type (should never be used).
    - - -
    PARAMETER_BAD  +
    PARAMETER_BAD 
    PARAMETER_OK  +
    PARAMETER_OK 
    PARAMETER_INACTIVE  +
    PARAMETER_INACTIVE 
    @@ -845,7 +845,7 @@ Invalid type (should never be used).

    Function Documentation

    -

    +

    @@ -900,7 +900,7 @@ Invalid type (should never be used).
    -

    +

    @@ -952,7 +952,7 @@ Check if an array parameter is set.
    -

    +

    @@ -1004,7 +1004,7 @@ Check if a boolean parameter is set.
    -

    +

    @@ -1056,7 +1056,7 @@ Check if a curve parameter is set.
    -

    +

    @@ -1108,7 +1108,7 @@ Check if a dimension parameter is set.
    -

    +

    @@ -1160,7 +1160,7 @@ Check if a file parameter is set.
    -

    +

    @@ -1212,7 +1212,7 @@ Check if a float parameter is set.
    -

    +

    @@ -1264,7 +1264,7 @@ Check if an integer parameter is set.
    -

    +

    @@ -1316,7 +1316,7 @@ Check if a raw parameter is set.
    -

    +

    @@ -1368,7 +1368,7 @@ Check if a string parameter is set.
    -

    +

    @@ -1413,7 +1413,7 @@ The parameter is set to NULL.
    Parameters:
    -

    +

    @@ -1458,7 +1458,7 @@ Clear (remove) a boolean parameter.
    -

    +

    @@ -1503,7 +1503,7 @@ The parameter is set to NULL.
    Parameters:
    -

    +

    @@ -1548,7 +1548,7 @@ Clear (remove) a dimension parameter.
    -

    +

    @@ -1593,7 +1593,7 @@ The parameter is set to NULL.
    Parameters:
    -

    +

    @@ -1638,7 +1638,7 @@ Clear (remove) a float parameter.
    -

    +

    @@ -1683,7 +1683,7 @@ Clear (remove) an integer parameter.
    -

    +

    @@ -1728,7 +1728,7 @@ The parameter is set to NULL.
    Parameters:
    -

    +

    @@ -1773,7 +1773,7 @@ The parameter is set to NULL.
    Parameters:
    -

    +

    @@ -1810,7 +1810,7 @@ The parameter is set to NULL.
    Parameters:
    -

    +

    @@ -1841,7 +1841,7 @@ The main use of this is to provide a usable stp_vars_t for purposes of parameter
    -

    +

    @@ -1893,7 +1893,7 @@ All of the parameter fields will be populated.
    Parameters:
    -

    +

    @@ -1945,7 +1945,7 @@ If the resolution is invalid, -1 will be returned in both x and y.
    <
    -

    +

    @@ -1982,7 +1982,7 @@ If the resolution is invalid, -1 will be returned in both x and y.
    <
    -

    +

    @@ -2019,7 +2019,7 @@ If the resolution is invalid, -1 will be returned in both x and y.
    <
    -

    +

    @@ -2065,7 +2065,7 @@ Get an array parameter.
    -

    +

    @@ -2111,7 +2111,7 @@ Get the activity status of an array parameter.
    -

    +

    @@ -2157,7 +2157,7 @@ Get a boolean parameter.
    -

    +

    @@ -2203,7 +2203,7 @@ Get the activity status of a boolean parameter.
    -

    +

    @@ -2234,7 +2234,7 @@ Get the name of the color conversion routine.
    -

    +

    @@ -2271,7 +2271,7 @@ Get the name of the color conversion routine.
    -

    +

    @@ -2317,7 +2317,7 @@ Get a curve parameter.
    -

    +

    @@ -2363,7 +2363,7 @@ Get the activity status of a curve parameter.
    -

    +

    @@ -2409,7 +2409,7 @@ Get a dimension parameter.
    -

    +

    @@ -2455,7 +2455,7 @@ Get the activity status of a dimension parameter.
    -

    +

    @@ -2486,7 +2486,7 @@ Get the name of the printer driver.
    -

    +

    @@ -2522,7 +2522,7 @@ Get the error data.
    -

    +

    @@ -2558,7 +2558,7 @@ Get the function used to print output information.
    -

    +

    @@ -2604,7 +2604,7 @@ Get a file parameter.
    -

    +

    @@ -2650,7 +2650,7 @@ Get the activity status of a file parameter.
    -

    +

    @@ -2696,7 +2696,7 @@ Get a float parameter.
    -

    +

    @@ -2742,7 +2742,7 @@ Get the activity status of a float parameter.
    -

    +

    @@ -2773,7 +2773,7 @@ Get the height of the image.
    -

    +

    @@ -2842,7 +2842,7 @@ If the media size stored in V is invalid, the return values will be indeterminat
    -

    +

    @@ -2888,7 +2888,7 @@ Get an integer parameter.
    -

    +

    @@ -2934,7 +2934,7 @@ Get the activity status of an integer parameter.
    -

    +

    @@ -2965,7 +2965,7 @@ Get the left edge of the image.
    -

    +

    @@ -3017,7 +3017,7 @@ Retrieve the media size of the media type set in V, expressed in units of 1/72".
    -

    +

    @@ -3053,7 +3053,7 @@ Get the output data.
    -

    +

    @@ -3089,7 +3089,7 @@ Get the function used to print output information.
    -

    +

    @@ -3120,7 +3120,7 @@ Get the page height.
    -

    +

    @@ -3151,7 +3151,7 @@ Get the page width.
    -

    +

    @@ -3187,7 +3187,7 @@ This does not fill in the bounds and defaults; it merely provides a list of sett
    -

    +

    @@ -3233,7 +3233,7 @@ Get a raw parameter.
    -

    +

    @@ -3279,7 +3279,7 @@ Get the activity status of a raw parameter.
    -

    +

    @@ -3345,7 +3345,7 @@ Retrieve the minimum and maximum size limits for custom media sizes with the cur
    -

    +

    @@ -3391,7 +3391,7 @@ Get a string parameter.
    -

    +

    @@ -3437,7 +3437,7 @@ Get the activity status of a string parameter.
    -

    +

    @@ -3468,7 +3468,7 @@ Get the top edge of the image.
    -

    +

    @@ -3496,7 +3496,7 @@ Get the top edge of the image.
    -

    +

    @@ -3527,7 +3527,7 @@ Get the width edge of the image.
    -

    +

    @@ -3573,7 +3573,7 @@ Merge defaults for a printer with user-chosen settings.
    -

    +

    @@ -3608,7 +3608,7 @@ This must be called even if the

    +

    @@ -3654,7 +3654,7 @@ Find a parameter by its name.
    -

    +

    @@ -3700,7 +3700,7 @@ Find a parameter by its name from a vars object.
    -

    +

    @@ -3745,7 +3745,7 @@ Add a parameter to a parameter_list.
    -

    +

    @@ -3790,7 +3790,7 @@ Append one parameter_list to another.
    -

    +

    @@ -3826,7 +3826,7 @@ A new parameter_list will be created, and then the contents of source will be co
    -

    +

    @@ -3862,7 +3862,7 @@ List the number of available parameters for the currently chosen settings.
    -

    +

    @@ -3893,7 +3893,7 @@ Create a parameter_list.
    -

    +

    @@ -3928,7 +3928,7 @@ It is an error to destroy the parameter_list more than once.
    -

    +

    @@ -3974,7 +3974,7 @@ Find a parameter by its index number.
    -

    +

    @@ -4026,7 +4026,7 @@ Multiply the value of a float parameter by a scaling factor.
    -

    +

    @@ -4078,7 +4078,7 @@ Set an array parameter.
    -

    +

    @@ -4130,7 +4130,7 @@ Set the activity of an array parameter.
    -

    +

    @@ -4182,7 +4182,7 @@ Set a boolean parameter.
    -

    +

    @@ -4234,7 +4234,7 @@ Set the activity of a boolean parameter.
    -

    +

    @@ -4279,7 +4279,7 @@ Set the name of the color conversion routine, if not the default.
    -

    +

    @@ -4331,7 +4331,7 @@ Set the name of the color conversion routine, if not the default.
    -

    +

    @@ -4383,7 +4383,7 @@ Set a curve parameter.
    -

    +

    @@ -4435,7 +4435,7 @@ Set the activity of a curveparameter.
    -

    +

    @@ -4487,7 +4487,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -4539,7 +4539,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -4591,7 +4591,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -4643,7 +4643,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -4695,7 +4695,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -4754,7 +4754,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -4806,7 +4806,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -4858,7 +4858,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -4917,7 +4917,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -4969,7 +4969,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -5028,7 +5028,7 @@ The value is set if the parameter is not already set. This avoids having to chec
    -

    +

    @@ -5080,7 +5080,7 @@ Set a dimension parameter.
    -

    +

    @@ -5132,7 +5132,7 @@ Set the activity of a dimension parameter.
    -

    +

    @@ -5177,7 +5177,7 @@ Set the name of the printer driver.
    -

    +

    @@ -5229,7 +5229,7 @@ Set the name of the printer driver.
    -

    +

    @@ -5274,7 +5274,7 @@ Set the error data.
    -

    +

    @@ -5319,7 +5319,7 @@ These must be supplied by the caller. errdata is passed as an arguments to errfu
    -

    +

    @@ -5371,7 +5371,7 @@ Set a file parameter.
    -

    +

    @@ -5423,7 +5423,7 @@ Set the activity of a file parameter.
    -

    +

    @@ -5482,7 +5482,7 @@ Set a file parameter.
    -

    +

    @@ -5534,7 +5534,7 @@ Set a float parameter.
    -

    +

    @@ -5586,7 +5586,7 @@ Set the activity of a float parameter.
    -

    +

    @@ -5631,7 +5631,7 @@ Set the height of the image.
    -

    +

    @@ -5683,7 +5683,7 @@ Set an integer parameter.
    -

    +

    @@ -5735,7 +5735,7 @@ Set the activity of an integer parameter.
    -

    +

    @@ -5780,7 +5780,7 @@ Set the left edge of the image.
    -

    +

    @@ -5825,7 +5825,7 @@ Set the output data.
    -

    +

    @@ -5870,7 +5870,7 @@ These must be supplied by the caller. outdata is passed as an arguments to outfu
    -

    +

    @@ -5915,7 +5915,7 @@ Set the page height.
    -

    +

    @@ -5960,7 +5960,7 @@ Set the page width.
    -

    +

    @@ -6019,7 +6019,7 @@ Set a raw parameter.
    -

    +

    @@ -6071,7 +6071,7 @@ Set the activity of a raw parameter.
    -

    +

    @@ -6123,7 +6123,7 @@ Set a string parameter.
    -

    +

    @@ -6175,7 +6175,7 @@ Set the activity of a string parameter.
    -

    +

    @@ -6234,7 +6234,7 @@ Set a string parameter.
    -

    +

    @@ -6279,7 +6279,7 @@ Set the top edge of the image.
    -

    +

    @@ -6316,7 +6316,7 @@ Set the top edge of the image.
    -

    +

    @@ -6361,7 +6361,7 @@ Set the width of the image.
    -

    +

    @@ -6406,7 +6406,7 @@ Both dest and source must be valid vars objects previously created with
    -

    +

    @@ -6437,7 +6437,7 @@ Create a new vars object.
    -

    +

    - - - - - - - - - - - - - - - - - - - - - - -
    @@ -6473,7 +6473,7 @@ source must be a valid vars object previously created with

    +

    @@ -6508,7 +6508,7 @@ It is an error to destroy the vars more than once.
    Parameters
    -

    +

    @@ -6544,7 +6544,7 @@ Verify that the parameters selected are consistent with those allowed by the dri
    -

    +

    @@ -6587,8 +6587,8 @@ Verify that the parameters selected are consistent with those allowed by the dri
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html index b513448..7baa6ec 100644 --- a/doc/gutenprint/html/group__version.html +++ b/doc/gutenprint/html/group__version.html @@ -3,7 +3,7 @@ libgutenprint API Reference: version - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    version

    Version information. More... @@ -51,7 +51,7 @@ Version information.

    Version information may be used to check the library version at compile-time, using macros, or at run-time, using constants.

    Define Documentation

    -

    +

    @@ -74,7 +74,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -114,7 +114,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -137,7 +137,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -160,7 +160,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -183,7 +183,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -206,7 +206,7 @@ Version information may be used to check the library version at compile-time, us
    -

    +

    @@ -230,7 +230,7 @@ Version information may be used to check the library version at compile-time, us

    Function Documentation

    -

    +

    @@ -284,7 +284,7 @@ Check whether the library provides the requested version.

    Variable Documentation

    -

    +

    @@ -309,7 +309,7 @@ The library ABI binary age number (number of forward-compatible revisions).
    -

    +

    @@ -334,7 +334,7 @@ The library ABI revision number (number of incompatible revisions).
    -

    +

    @@ -359,7 +359,7 @@ The library ABI interface age number (number of revisions of this ABI).
    -

    +

    @@ -384,7 +384,7 @@ The library major version number.
    -

    +

    @@ -409,7 +409,7 @@ The library micro version number.
    -

    +

    @@ -434,8 +434,8 @@ The library minor version number.
    -

    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/gutenprint-intl-internal_8h.html b/doc/gutenprint/html/gutenprint-intl-internal_8h.html index 7ec4b32..0e0dc00 100644 --- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html +++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/gutenprint-intl-internal.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -31,8 +31,8 @@

    Detailed Description

    Internationalisation functions.

    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html index 5a40d1e..b5f5c2b 100644 --- a/doc/gutenprint/html/gutenprint-intl_8h.html +++ b/doc/gutenprint/html/gutenprint-intl_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/gutenprint-intl.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -31,8 +31,8 @@

    Detailed Description

    Internationalisation functions.

    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html index 1fa63c9..0b248bf 100644 --- a/doc/gutenprint/html/gutenprint-module_8h.html +++ b/doc/gutenprint/html/gutenprint-module_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/gutenprint-module.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -29,7 +29,7 @@ Gutenprint module header.

    This header includes all of the public headers used by modules.

    Define Documentation

    -

    +

    @@ -52,8 +52,8 @@ This header includes all of the public headers used by modules.

    Define Do

    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html index 5c9c1ec..8573e3d 100644 --- a/doc/gutenprint/html/gutenprint-version_8h.html +++ b/doc/gutenprint/html/gutenprint-version_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/gutenprint-version.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -26,35 +26,12 @@
    #define STP_CHECK_VERSION(major, minor, micro)

    Functions

    const char * stp_check_version (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)
     Check whether the library provides the requested version.

    Variables

    const unsigned int stp_major_version
     The library major version number.
    const unsigned int stp_minor_version
     The library minor version number.
    const unsigned int stp_micro_version
     The library micro version number.
    const unsigned int stp_current_interface
     The library ABI revision number (number of incompatible revisions).
    const unsigned int stp_binary_age
     The library ABI binary age number (number of forward-compatible revisions).
    const unsigned int stp_interface_age
     The library ABI interface age number (number of revisions of this ABI).

    Detailed Description

    Version functions.

    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html index c126757..e089cfb 100644 --- a/doc/gutenprint/html/gutenprint_8h.html +++ b/doc/gutenprint/html/gutenprint_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/gutenprint.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -27,8 +27,8 @@

    Detailed Description

    Gutenprint master header.

    -This header includes all of the public headers.

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +This header includes all of the public headers.
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html index 95b6b6b..6925080 100644 --- a/doc/gutenprint/html/image_8h.html +++ b/doc/gutenprint/html/image_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/image.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -47,8 +47,8 @@

    Detailed Description

    Image functions.

    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html index 3ba1939..96f1e46 100644 --- a/doc/gutenprint/html/index.html +++ b/doc/gutenprint/html/index.html @@ -3,12 +3,12 @@ libgutenprint API Reference: Main Page - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    libgutenprint API Reference Documentation

    -

    5.0.0-rc1

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +

    5.0.0-rc1

    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html index 26e7fc5..8bff16e 100644 --- a/doc/gutenprint/html/list_8h.html +++ b/doc/gutenprint/html/list_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/list.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -113,8 +113,8 @@

    Detailed Description

    Generic list functions.

    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html index 2d1ce3d..4b905dd 100644 --- a/doc/gutenprint/html/module_8h.html +++ b/doc/gutenprint/html/module_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/module.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -51,7 +51,7 @@ Module functions.

    Typedef Documentation

    -

    +

    @@ -74,7 +74,7 @@ Module functions.
    -

    +

    @@ -98,7 +98,7 @@ Module functions.

    Enumeration Type Documentation

    -

    +

    @@ -120,15 +120,15 @@ Module functions.

    Enumerator:
    - - - - -
    STP_MODULE_CLASS_INVALID  +
    STP_MODULE_CLASS_INVALID 
    STP_MODULE_CLASS_MISC  +
    STP_MODULE_CLASS_MISC 
    STP_MODULE_CLASS_FAMILY  +
    STP_MODULE_CLASS_FAMILY 
    STP_MODULE_CLASS_COLOR  +
    STP_MODULE_CLASS_COLOR 
    STP_MODULE_CLASS_DITHER  +
    STP_MODULE_CLASS_DITHER 
    @@ -136,7 +136,7 @@ Module functions.

    Function Documentation

    -

    +

    @@ -164,7 +164,7 @@ Module functions.
    -

    +

    @@ -192,7 +192,7 @@ Module functions.
    -

    +

    @@ -220,7 +220,7 @@ Module functions.
    -

    +

    @@ -248,7 +248,7 @@ Module functions.
    -

    +

    @@ -276,7 +276,7 @@ Module functions.
    -

    +

    @@ -304,8 +304,8 @@ Module functions.
    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html index 3fc2a6e..63f58e0 100644 --- a/doc/gutenprint/html/modules.html +++ b/doc/gutenprint/html/modules.html @@ -3,7 +3,7 @@ libgutenprint API Reference: Module Index - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    libgutenprint API Reference Modules

    Here is a list of all modules: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html index d6c9f09..d9e72ac 100644 --- a/doc/gutenprint/html/mxml_8h.html +++ b/doc/gutenprint/html/mxml_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/mxml.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -122,7 +122,7 @@ Mini-XML XML parsing functions.

    Define Documentation

    -

    +

    @@ -145,7 +145,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -168,7 +168,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -191,7 +191,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -214,7 +214,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -237,7 +237,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -260,7 +260,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -283,7 +283,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -306,7 +306,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -329,7 +329,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -352,7 +352,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -375,7 +375,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -398,7 +398,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -421,7 +421,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -445,7 +445,7 @@ Mini-XML XML parsing functions.

    Typedef Documentation

    -

    +

    @@ -468,7 +468,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -491,7 +491,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -514,7 +514,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -537,7 +537,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -560,7 +560,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -584,7 +584,7 @@ Mini-XML XML parsing functions.

    Enumeration Type Documentation

    -

    +

    @@ -606,15 +606,15 @@ Mini-XML XML parsing functions.

    Enumerator:
    - - - - -
    STP_MXML_ELEMENT  +
    STP_MXML_ELEMENT 
    STP_MXML_INTEGER  +
    STP_MXML_INTEGER 
    STP_MXML_OPAQUE  +
    STP_MXML_OPAQUE 
    STP_MXML_REAL  +
    STP_MXML_REAL 
    STP_MXML_TEXT  +
    STP_MXML_TEXT 
    @@ -622,7 +622,7 @@ Mini-XML XML parsing functions.

    Function Documentation

    -

    +

    @@ -671,7 +671,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -699,7 +699,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -736,7 +736,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -779,7 +779,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -840,7 +840,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -883,7 +883,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -926,7 +926,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -963,7 +963,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1000,7 +1000,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1037,7 +1037,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1074,7 +1074,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1117,7 +1117,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1145,7 +1145,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1182,7 +1182,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1225,7 +1225,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1274,7 +1274,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1317,7 +1317,7 @@ Mini-XML XML parsing functions.
    -

    +

    @@ -1360,8 +1360,8 @@ Mini-XML XML parsing functions.
    -

    Generated on Sat Jul 2 09:45:08 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html index a139373..b219e11 100644 --- a/doc/gutenprint/html/pages.html +++ b/doc/gutenprint/html/pages.html @@ -3,14 +3,14 @@ libgutenprint API Reference: Page Index - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    libgutenprint API Reference Related Pages

    Here is a list of all related documentation pages: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html index 6dd7bcb..3152e40 100644 --- a/doc/gutenprint/html/paper_8h.html +++ b/doc/gutenprint/html/paper_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/paper.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -43,8 +43,8 @@

    Detailed Description

    Paper size functions.

    -

    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html index eda875f..8caa112 100644 --- a/doc/gutenprint/html/path_8h.html +++ b/doc/gutenprint/html/path_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/path.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -21,7 +21,7 @@ Simple directory path functions.

    Function Documentation

    -

    +

    @@ -58,7 +58,7 @@ Simple directory path functions.
    -

    +

    @@ -95,8 +95,8 @@ Simple directory path functions.
    -

    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html index 7091a99..49217e4 100644 --- a/doc/gutenprint/html/printers_8h.html +++ b/doc/gutenprint/html/printers_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/printers.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -93,8 +93,8 @@

    Detailed Description

    Printer functions.

    -

    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html index 810e717..c760073 100644 --- a/doc/gutenprint/html/sequence_8h.html +++ b/doc/gutenprint/html/sequence_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/sequence.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -104,8 +104,8 @@

    Detailed Description

    Sequence functions.

    -

    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html index c315fcf..b3fb51b 100644 --- a/doc/gutenprint/html/string-list_8h.html +++ b/doc/gutenprint/html/string-list_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/string-list.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -45,7 +45,7 @@ String list functions.

    Typedef Documentation

    -

    +

    @@ -71,7 +71,7 @@ The string_list opaque data type.

    Function Documentation

    -

    +

    @@ -114,7 +114,7 @@ The string_list opaque data type.
    -

    +

    @@ -142,7 +142,7 @@ The string_list opaque data type.
    -

    +

    @@ -170,7 +170,7 @@ The string_list opaque data type.
    -

    +

    @@ -198,7 +198,7 @@ The string_list opaque data type.
    -

    +

    @@ -235,7 +235,7 @@ The string_list opaque data type.
    -

    +

    @@ -263,7 +263,7 @@ The string_list opaque data type.
    -

    +

    @@ -300,7 +300,7 @@ The string_list opaque data type.
    -

    +

    @@ -337,7 +337,7 @@ The string_list opaque data type.
    -

    +

    @@ -374,7 +374,7 @@ The string_list opaque data type.
    -

    +

    @@ -411,8 +411,8 @@ The string_list opaque data type.
    -

    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html index 6c10703..0deabb4 100644 --- a/doc/gutenprint/html/structdither__matrix__impl.html +++ b/doc/gutenprint/html/structdither__matrix__impl.html @@ -3,9 +3,9 @@ libgutenprint API Reference: dither_matrix_impl Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    dither_matrix_impl Struct Reference

    #include <dither.h> +

    dither_matrix_impl Struct Reference

    #include <dither.h>

    @@ -42,7 +42,7 @@

    Field Documentation

    -

    +

    @@ -65,7 +65,7 @@
    -

    +

    @@ -88,7 +88,7 @@
    -

    +

    @@ -111,7 +111,7 @@
    -

    +

    @@ -134,7 +134,7 @@
    -

    +

    @@ -157,7 +157,7 @@
    -

    +

    @@ -180,7 +180,7 @@
    -

    +

    @@ -203,7 +203,7 @@
    -

    +

    @@ -226,7 +226,7 @@
    -

    +

    @@ -249,7 +249,7 @@
    -

    +

    @@ -272,7 +272,7 @@
    -

    +

    @@ -295,7 +295,7 @@
    -

    +

    @@ -318,7 +318,7 @@
    -

    +

    @@ -341,7 +341,7 @@
    -

    +

    @@ -364,7 +364,7 @@
    -

    +

    @@ -389,8 +389,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__cached__curve__t.html b/doc/gutenprint/html/structstp__cached__curve__t.html index a3a105e..fa0b410 100644 --- a/doc/gutenprint/html/structstp__cached__curve__t.html +++ b/doc/gutenprint/html/structstp__cached__curve__t.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_cached_curve_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_cached_curve_t Struct Reference

    #include <curve-cache.h> +

    stp_cached_curve_t Struct Reference

    #include <curve-cache.h>

    @@ -20,7 +20,7 @@

    Field Documentation

    -

    +

    @@ -43,7 +43,7 @@
    -

    +

    @@ -66,7 +66,7 @@
    -

    +

    @@ -89,7 +89,7 @@
    -

    +

    @@ -114,8 +114,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color.html index 74f0694..588ed70 100644 --- a/doc/gutenprint/html/structstp__color.html +++ b/doc/gutenprint/html/structstp__color.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_color Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_color Struct Reference
    [color] -

    #include <color.h> +#include <color.h>

    @@ -21,7 +21,7 @@

    Field Documentation

    -

    +

    @@ -44,7 +44,7 @@
    -

    +

    @@ -67,7 +67,7 @@
    -

    +

    @@ -92,8 +92,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html index 4e61e2b..ca8f420 100644 --- a/doc/gutenprint/html/structstp__colorfuncs__t.html +++ b/doc/gutenprint/html/structstp__colorfuncs__t.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_colorfuncs_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_colorfuncs_t Struct Reference
    [color] -

    #include <color.h> +#include <color.h>

    @@ -23,7 +23,7 @@

    Field Documentation

    -

    +

    @@ -46,7 +46,7 @@
    -

    +

    @@ -69,7 +69,7 @@
    -

    +

    @@ -92,7 +92,7 @@
    -

    +

    @@ -117,8 +117,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__curve__point__t.html b/doc/gutenprint/html/structstp__curve__point__t.html index 536e9af..0c050b6 100644 --- a/doc/gutenprint/html/structstp__curve__point__t.html +++ b/doc/gutenprint/html/structstp__curve__point__t.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_curve_point_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_curve_point_t Struct Reference
    [curve] -

    Point (x,y) for piecewise curve. +Point (x,y) for piecewise curve. More...

    #include <curve.h> @@ -27,7 +27,7 @@ Point (x,y) for piecewise curve.

    Field Documentation

    -

    +

    @@ -52,7 +52,7 @@ Horizontal position.
    -

    +

    @@ -79,8 +79,8 @@ Vertical position.

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic.html b/doc/gutenprint/html/structstp__dither__matrix__generic.html index 39b7adf..fe6b102 100644 --- a/doc/gutenprint/html/structstp__dither__matrix__generic.html +++ b/doc/gutenprint/html/structstp__dither__matrix__generic.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_dither_matrix_generic Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_dither_matrix_generic Struct Reference

    #include <dither.h> +

    stp_dither_matrix_generic Struct Reference

    #include <dither.h>

    @@ -22,7 +22,7 @@

    Field Documentation

    -

    +

    @@ -45,7 +45,7 @@
    -

    +

    @@ -68,7 +68,7 @@
    -

    +

    @@ -91,7 +91,7 @@
    -

    +

    @@ -114,7 +114,7 @@
    -

    +

    @@ -139,8 +139,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal.html b/doc/gutenprint/html/structstp__dither__matrix__normal.html index 6905646..3352d57 100644 --- a/doc/gutenprint/html/structstp__dither__matrix__normal.html +++ b/doc/gutenprint/html/structstp__dither__matrix__normal.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_dither_matrix_normal Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_dither_matrix_normal Struct Reference

    #include <dither.h> +

    stp_dither_matrix_normal Struct Reference

    #include <dither.h>

    @@ -22,7 +22,7 @@

    Field Documentation

    -

    +

    @@ -45,7 +45,7 @@
    -

    +

    @@ -68,7 +68,7 @@
    -

    +

    @@ -91,7 +91,7 @@
    -

    +

    @@ -114,7 +114,7 @@
    -

    +

    @@ -139,8 +139,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__dither__matrix__short.html b/doc/gutenprint/html/structstp__dither__matrix__short.html index f7bb824..d5b3f9f 100644 --- a/doc/gutenprint/html/structstp__dither__matrix__short.html +++ b/doc/gutenprint/html/structstp__dither__matrix__short.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_dither_matrix_short Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_dither_matrix_short Struct Reference

    #include <dither.h> +

    stp_dither_matrix_short Struct Reference

    #include <dither.h>

    @@ -22,7 +22,7 @@

    Field Documentation

    -

    +

    @@ -45,7 +45,7 @@
    -

    +

    @@ -68,7 +68,7 @@
    -

    +

    @@ -91,7 +91,7 @@
    -

    +

    @@ -114,7 +114,7 @@
    -

    +

    @@ -139,8 +139,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize.html index 4630fbd..7fa89cb 100644 --- a/doc/gutenprint/html/structstp__dotsize.html +++ b/doc/gutenprint/html/structstp__dotsize.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_dotsize Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_dotsize Struct Reference

    #include <dither.h> +

    stp_dotsize Struct Reference

    #include <dither.h>

    @@ -16,7 +16,7 @@

    Field Documentation

    -

    +

    @@ -39,7 +39,7 @@
    -

    +

    @@ -64,8 +64,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__double__bound__t.html b/doc/gutenprint/html/structstp__double__bound__t.html index 2480d35..5dfae95 100644 --- a/doc/gutenprint/html/structstp__double__bound__t.html +++ b/doc/gutenprint/html/structstp__double__bound__t.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_double_bound_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_double_bound_t Struct Reference
    [vars] -

    double_bound (range) parameter. +double_bound (range) parameter. More...

    #include <vars.h> @@ -25,7 +25,7 @@ double_bound (range) parameter.

    Field Documentation

    -

    +

    @@ -48,7 +48,7 @@ double_bound (range) parameter. Lower bound.
    -

    +

    @@ -73,8 +73,8 @@ Upper bound.

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__family.html b/doc/gutenprint/html/structstp__family.html index 3b80780..a21e609 100644 --- a/doc/gutenprint/html/structstp__family.html +++ b/doc/gutenprint/html/structstp__family.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_family Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_family Struct Reference
    [printer] -

    #include <printers.h> +#include <printers.h>

    @@ -19,7 +19,7 @@

    Field Documentation

    -

    +

    @@ -42,7 +42,7 @@
    -

    +

    @@ -67,8 +67,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__image.html b/doc/gutenprint/html/structstp__image.html index e5b4644..ea9ede8 100644 --- a/doc/gutenprint/html/structstp__image.html +++ b/doc/gutenprint/html/structstp__image.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_image Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_image Struct Reference
    [image] -

    The image type is an abstract data type for interfacing with the image creation program. +The image type is an abstract data type for interfacing with the image creation program. More...

    #include <image.h> @@ -47,7 +47,7 @@ The image type is an abstract data type for interfacing with the image creation It provides callbacks to functions defined within the client application which are called while printing the image.

    Field Documentation

    -

    +

    @@ -72,7 +72,7 @@ This callback is called at the end of each page.
    -

    +

    @@ -97,7 +97,7 @@ This callback returns the name of the application. This is embedded in the output by some drivers.
    -

    +

    @@ -130,7 +130,7 @@ It is called from the driver layer. It should copy WIDTH (as returned by the
    -

    +

    @@ -160,7 +160,7 @@ This callback returns the height of the image in pixels.
    -

    +

    @@ -190,7 +190,7 @@ It will be called once per image.
    Parameters:
    -

    +

    @@ -215,7 +215,7 @@ A pointer to an application-specific state information that might need to be ass
    -

    +

    @@ -246,7 +246,7 @@ It may (in principle) be called multiple times if a page is being printed more t
    -

    +

    @@ -278,8 +278,8 @@ This callback returns the width of the image in pixels.

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__int__bound__t.html b/doc/gutenprint/html/structstp__int__bound__t.html index ca86f47..c977745 100644 --- a/doc/gutenprint/html/structstp__int__bound__t.html +++ b/doc/gutenprint/html/structstp__int__bound__t.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_int_bound_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_int_bound_t Struct Reference
    [vars] -

    int_bound (range) parameter. +int_bound (range) parameter. More...

    #include <vars.h> @@ -25,7 +25,7 @@ int_bound (range) parameter.

    Field Documentation

    -

    +

    @@ -48,7 +48,7 @@ int_bound (range) parameter. Lower bound.
    -

    +

    @@ -73,8 +73,8 @@ Upper bound.

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html index 62ce653..5e5c578 100644 --- a/doc/gutenprint/html/structstp__lineactive__t.html +++ b/doc/gutenprint/html/structstp__lineactive__t.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_lineactive_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_lineactive_t Struct Reference

    #include <weave.h> +

    stp_lineactive_t Struct Reference

    #include <weave.h>

    @@ -16,7 +16,7 @@

    Field Documentation

    -

    +

    @@ -39,7 +39,7 @@
    -

    +

    @@ -64,8 +64,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html index 90b0eb8..68a3394 100644 --- a/doc/gutenprint/html/structstp__linebounds__t.html +++ b/doc/gutenprint/html/structstp__linebounds__t.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_linebounds_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_linebounds_t Struct Reference

    #include <weave.h> +

    stp_linebounds_t Struct Reference

    #include <weave.h>

    @@ -18,7 +18,7 @@

    Field Documentation

    -

    +

    @@ -41,7 +41,7 @@
    -

    +

    @@ -64,7 +64,7 @@
    -

    +

    @@ -89,8 +89,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html index 00ebfd8..dfca789 100644 --- a/doc/gutenprint/html/structstp__linebufs__t.html +++ b/doc/gutenprint/html/structstp__linebufs__t.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_linebufs_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_linebufs_t Struct Reference

    #include <weave.h> +

    stp_linebufs_t Struct Reference

    #include <weave.h>

    @@ -16,7 +16,7 @@

    Field Documentation

    -

    +

    @@ -39,7 +39,7 @@
    -

    +

    @@ -64,8 +64,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html index 082d291..f3beb75 100644 --- a/doc/gutenprint/html/structstp__linecount__t.html +++ b/doc/gutenprint/html/structstp__linecount__t.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_linecount_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_linecount_t Struct Reference

    #include <weave.h> +

    stp_linecount_t Struct Reference

    #include <weave.h>

    @@ -16,7 +16,7 @@

    Field Documentation

    -

    +

    @@ -39,7 +39,7 @@
    -

    +

    @@ -64,8 +64,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html index 9366ead..b356e36 100644 --- a/doc/gutenprint/html/structstp__lineoff__t.html +++ b/doc/gutenprint/html/structstp__lineoff__t.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_lineoff_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_lineoff_t Struct Reference

    #include <weave.h> +

    stp_lineoff_t Struct Reference

    #include <weave.h>

    @@ -16,7 +16,7 @@

    Field Documentation

    -

    +

    @@ -39,7 +39,7 @@
    -

    +

    @@ -64,8 +64,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__module.html b/doc/gutenprint/html/structstp__module.html index 47ec90d..838eb0d 100644 --- a/doc/gutenprint/html/structstp__module.html +++ b/doc/gutenprint/html/structstp__module.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_module Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_module Struct Reference

    #include <module.h> +

    stp_module Struct Reference

    #include <module.h>

    @@ -28,7 +28,7 @@

    Field Documentation

    -

    +

    @@ -51,7 +51,7 @@
    -

    +

    @@ -74,7 +74,7 @@
    -

    +

    @@ -97,7 +97,7 @@
    -

    +

    @@ -120,7 +120,7 @@
    -

    +

    @@ -143,7 +143,7 @@
    -

    +

    @@ -166,7 +166,7 @@
    -

    +

    @@ -189,7 +189,7 @@
    -

    +

    @@ -214,8 +214,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version.html index 57c1836..87cf308 100644 --- a/doc/gutenprint/html/structstp__module__version.html +++ b/doc/gutenprint/html/structstp__module__version.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_module_version Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_module_version Struct Reference

    #include <module.h> +

    stp_module_version Struct Reference

    #include <module.h>

    @@ -16,7 +16,7 @@

    Field Documentation

    -

    +

    @@ -39,7 +39,7 @@
    -

    +

    @@ -64,8 +64,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__mxml__attr__s.html b/doc/gutenprint/html/structstp__mxml__attr__s.html index 37c5b69..99b593d 100644 --- a/doc/gutenprint/html/structstp__mxml__attr__s.html +++ b/doc/gutenprint/html/structstp__mxml__attr__s.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_mxml_attr_s Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_mxml_attr_s Struct Reference

    #include <mxml.h> +

    stp_mxml_attr_s Struct Reference

    #include <mxml.h>

    @@ -16,7 +16,7 @@

    Field Documentation

    -

    +

    @@ -39,7 +39,7 @@
    -

    +

    @@ -64,8 +64,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__mxml__node__s.html b/doc/gutenprint/html/structstp__mxml__node__s.html index efb3129..53e9b48 100644 --- a/doc/gutenprint/html/structstp__mxml__node__s.html +++ b/doc/gutenprint/html/structstp__mxml__node__s.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_mxml_node_s Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_mxml_node_s Struct Reference

    #include <mxml.h> +

    stp_mxml_node_s Struct Reference

    #include <mxml.h>

    @@ -26,7 +26,7 @@

    Field Documentation

    -

    +

    @@ -49,7 +49,7 @@
    -

    +

    @@ -72,7 +72,7 @@
    -

    +

    @@ -95,7 +95,7 @@
    -

    +

    @@ -118,7 +118,7 @@
    -

    +

    @@ -141,7 +141,7 @@
    -

    +

    @@ -164,7 +164,7 @@
    -

    +

    @@ -189,8 +189,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__mxml__text__s.html b/doc/gutenprint/html/structstp__mxml__text__s.html index 785445a..1c05b8e 100644 --- a/doc/gutenprint/html/structstp__mxml__text__s.html +++ b/doc/gutenprint/html/structstp__mxml__text__s.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_mxml_text_s Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_mxml_text_s Struct Reference

    #include <mxml.h> +

    stp_mxml_text_s Struct Reference

    #include <mxml.h>

    @@ -16,7 +16,7 @@

    Field Documentation

    -

    +

    @@ -39,7 +39,7 @@
    -

    +

    @@ -64,8 +64,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__mxml__value__s.html b/doc/gutenprint/html/structstp__mxml__value__s.html index c4c8848..b2cbc35 100644 --- a/doc/gutenprint/html/structstp__mxml__value__s.html +++ b/doc/gutenprint/html/structstp__mxml__value__s.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_mxml_value_s Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_mxml_value_s Struct Reference

    #include <mxml.h> +

    stp_mxml_value_s Struct Reference

    #include <mxml.h>

    @@ -18,7 +18,7 @@

    Field Documentation

    -

    +

    @@ -41,7 +41,7 @@
    -

    +

    @@ -64,7 +64,7 @@
    -

    +

    @@ -89,8 +89,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html index 756152a..c23346a 100644 --- a/doc/gutenprint/html/structstp__papersize__t.html +++ b/doc/gutenprint/html/structstp__papersize__t.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_papersize_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_papersize_t Struct Reference
    [papersize] -

    The papersize data type. +The papersize data type. More...

    #include <paper.h> @@ -51,7 +51,7 @@ The papersize data type.

    Field Documentation

    -

    +

    @@ -76,7 +76,7 @@ Bottom margin.
    -

    +

    @@ -101,7 +101,7 @@ Comment.
    -

    +

    @@ -126,7 +126,7 @@ Paper height.
    -

    +

    @@ -151,7 +151,7 @@ Left margin.
    -

    +

    @@ -176,7 +176,7 @@ Short unique name (not translated).
    -

    +

    @@ -201,7 +201,7 @@ Units of measurement.
    -

    +

    @@ -226,7 +226,7 @@ Right margin.
    -

    +

    @@ -251,7 +251,7 @@ Long descriptive name (translated).
    -

    +

    @@ -276,7 +276,7 @@ Top margin.
    -

    +

    @@ -303,8 +303,8 @@ Paper width.

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__param__string__t.html b/doc/gutenprint/html/structstp__param__string__t.html index 917e17b..9fee42e 100644 --- a/doc/gutenprint/html/structstp__param__string__t.html +++ b/doc/gutenprint/html/structstp__param__string__t.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_param_string_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_param_string_t Struct Reference

    String parameter. +

    stp_param_string_t Struct Reference

    String parameter. More...

    #include <string-list.h> @@ -24,7 +24,7 @@ String parameter. Representation of a choice list of strings. The choices themselves consist of a key and a human-readable name. The list object is opaque.

    Field Documentation

    -

    +

    @@ -47,7 +47,7 @@ Representation of a choice list of strings. The choices themselves consist of a Option name (key, untranslated).
    -

    +

    @@ -72,8 +72,8 @@ Option name (key, untranslated). Human-readable (translated) text.

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html index 885519d..94487ba 100644 --- a/doc/gutenprint/html/structstp__parameter__t.html +++ b/doc/gutenprint/html/structstp__parameter__t.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_parameter_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_parameter_t Struct Reference
    [vars] -

    Parameter description. +Parameter description. More...

    #include <vars.h> @@ -79,7 +79,7 @@ Parameter description.

    Field Documentation

    -

    +

    @@ -102,7 +102,7 @@ Parameter description. Default array parameter value.
    -

    +

    array parameter value.
    @@ -125,7 +125,7 @@ Default array parameter value.
    -

    +

    Default boolean parameter value.
    @@ -148,7 +148,7 @@ array parameter value.
    -

    +

    Limits on the values the parameter may take.
    @@ -171,7 +171,7 @@ Default boolean parameter value.
    -

    +

    User-visible category name.
    @@ -194,7 +194,7 @@ Limits on the values the parameter may take.
    -

    +

    The channel to which this parameter applies
    @@ -217,7 +217,7 @@ User-visible category name.
    -

    +

    Default curve parameter value.
    @@ -240,7 +240,7 @@ The channel to which this parameter applies
    -

    +

    curve parameter value.
    @@ -263,7 +263,7 @@ Default curve parameter value.
    -

    +

    Default double parameter value.
    @@ -286,7 +286,7 @@ curve parameter value.
    -

    +

    double_bound parameter value.
    @@ -309,7 +309,7 @@ Default double parameter value.
    -

    +

    Default value of the parameter.
    @@ -332,7 +332,7 @@ double_bound parameter value.
    -

    +

    Default dimension parameter value.
    @@ -355,7 +355,7 @@ Default value of the parameter.
    -

    +

    int_bound parameter value.
    @@ -378,7 +378,7 @@ Default dimension parameter value.
    -

    +

    Help string.
    @@ -401,7 +401,7 @@ int_bound parameter value.
    -

    +

    Default int parameter value.
    @@ -424,7 +424,7 @@ Help string.
    -

    +

    int_bound parameter value.
    @@ -447,7 +447,7 @@ Default int parameter value.
    -

    +

    Is the parameter active?
    @@ -470,7 +470,7 @@ int_bound parameter value.
    -

    +

    The parameter is required, even when set inactive.
    @@ -493,7 +493,7 @@ Is the parameter active?
    -

    +

    Internal name (key).
    @@ -516,7 +516,7 @@ The parameter is required, even when set inactive.
    -

    +

    Parameter class.
    @@ -539,7 +539,7 @@ Internal name (key).
    -

    +

    Parameter level.
    @@ -562,7 +562,7 @@ Parameter class.
    -

    +

    Parameter type.
    @@ -585,7 +585,7 @@ Parameter level.
    -

    +

    @@ -608,7 +608,7 @@ Parameter type.
    -

    +

    Default string parameter value.
    @@ -631,7 +631,7 @@ Parameter type.
    -

    +

    string_list parameter value.
    @@ -654,7 +654,7 @@ Default string parameter value.
    -

    +

    User-visible name.
    @@ -677,7 +677,7 @@ string_list parameter value.
    -

    +

    @@ -702,8 +702,8 @@ Should the verify system check this parameter?

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html index 3147848..0723704 100644 --- a/doc/gutenprint/html/structstp__pass__t.html +++ b/doc/gutenprint/html/structstp__pass__t.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_pass_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_pass_t Struct Reference

    #include <weave.h> +

    stp_pass_t Struct Reference

    #include <weave.h>

    @@ -24,7 +24,7 @@

    Field Documentation

    -

    +

    @@ -47,7 +47,7 @@
    -

    +

    @@ -70,7 +70,7 @@
    -

    +

    @@ -93,7 +93,7 @@
    -

    +

    @@ -116,7 +116,7 @@
    -

    +

    @@ -139,7 +139,7 @@
    -

    +

    @@ -164,8 +164,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html index ad1c517..6908df7 100644 --- a/doc/gutenprint/html/structstp__printfuncs__t.html +++ b/doc/gutenprint/html/structstp__printfuncs__t.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_printfuncs_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_printfuncs_t Struct Reference
    [printer] -

    #include <printers.h> +#include <printers.h>

    @@ -37,7 +37,7 @@

    Field Documentation

    -

    +

    @@ -60,7 +60,7 @@
    -

    +

    @@ -83,7 +83,7 @@
    -

    +

    @@ -106,7 +106,7 @@
    -

    +

    @@ -129,7 +129,7 @@
    -

    +

    @@ -152,7 +152,7 @@
    -

    +

    @@ -175,7 +175,7 @@
    -

    +

    @@ -198,7 +198,7 @@
    -

    +

    @@ -221,7 +221,7 @@
    -

    +

    @@ -244,7 +244,7 @@
    -

    +

    @@ -267,7 +267,7 @@
    -

    +

    @@ -292,8 +292,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html index d07efa4..648e09b 100644 --- a/doc/gutenprint/html/structstp__raw__t.html +++ b/doc/gutenprint/html/structstp__raw__t.html @@ -3,12 +3,12 @@ libgutenprint API Reference: stp_raw_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages

    stp_raw_t Struct Reference
    [vars] -

    Raw parameter. +Raw parameter. More...

    #include <vars.h> @@ -25,7 +25,7 @@ Raw parameter.

    Field Documentation

    -

    +

    @@ -48,7 +48,7 @@ Raw parameter. Size of data.
    -

    +

    @@ -73,8 +73,8 @@ Raw data.

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade.html index 13501e8..a48f5e5 100644 --- a/doc/gutenprint/html/structstp__shade.html +++ b/doc/gutenprint/html/structstp__shade.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_shade Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_shade Struct Reference

    #include <dither.h> +

    stp_shade Struct Reference

    #include <dither.h>

    @@ -18,7 +18,7 @@

    Field Documentation

    -

    +

    @@ -41,7 +41,7 @@
    -

    +

    @@ -64,7 +64,7 @@
    -

    +

    @@ -89,8 +89,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html index a9bd84c..edeadb0 100644 --- a/doc/gutenprint/html/structstp__weave__t.html +++ b/doc/gutenprint/html/structstp__weave__t.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_weave_t Struct Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_weave_t Struct Reference

    #include <weave.h> +

    stp_weave_t Struct Reference

    #include <weave.h>

    @@ -26,7 +26,7 @@

    Field Documentation

    -

    +

    @@ -49,7 +49,7 @@
    -

    +

    @@ -72,7 +72,7 @@
    -

    +

    @@ -95,7 +95,7 @@
    -

    +

    @@ -118,7 +118,7 @@
    -

    +

    @@ -141,7 +141,7 @@
    -

    +

    @@ -164,7 +164,7 @@
    -

    +

    @@ -189,8 +189,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/unionstp__mxml__value__u.html b/doc/gutenprint/html/unionstp__mxml__value__u.html index 7c2cb48..dbc98ac 100644 --- a/doc/gutenprint/html/unionstp__mxml__value__u.html +++ b/doc/gutenprint/html/unionstp__mxml__value__u.html @@ -3,9 +3,9 @@ libgutenprint API Reference: stp_mxml_value_u Union Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    -

    stp_mxml_value_u Union Reference

    #include <mxml.h> +

    stp_mxml_value_u Union Reference

    #include <mxml.h>

    @@ -22,7 +22,7 @@

    Field Documentation

    -

    +

    @@ -45,7 +45,7 @@
    -

    +

    @@ -68,7 +68,7 @@
    -

    +

    @@ -91,7 +91,7 @@
    -

    +

    @@ -114,7 +114,7 @@
    -

    +

    @@ -139,8 +139,8 @@

    The documentation for this union was generated from the following file: -
    Generated on Sat Jul 2 09:45:10 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html index 655f5ef..6f19c26 100644 --- a/doc/gutenprint/html/util_8h.html +++ b/doc/gutenprint/html/util_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/util.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -133,8 +133,8 @@

    Detailed Description

    Utility functions.

    -

    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html index df4b4ab..a18d741 100644 --- a/doc/gutenprint/html/vars_8h.html +++ b/doc/gutenprint/html/vars_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/vars.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -470,8 +470,8 @@

    Detailed Description

    Print job functions.

    -

    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html index 1d5a0ec..f74eacd 100644 --- a/doc/gutenprint/html/weave_8h.html +++ b/doc/gutenprint/html/weave_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/weave.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -87,7 +87,7 @@ Softweave functions.

    Define Documentation

    -

    +

    @@ -111,7 +111,7 @@ Softweave functions.

    Typedef Documentation

    -

    +

    @@ -134,7 +134,7 @@ Softweave functions.
    -

    +

    @@ -157,7 +157,7 @@ Softweave functions.
    -

    +

    @@ -180,7 +180,7 @@ Softweave functions.
    -

    +

    @@ -204,7 +204,7 @@ Softweave functions.

    Enumeration Type Documentation

    -

    +

    @@ -226,17 +226,17 @@ Softweave functions.

    Enumerator:
    - - - - - -
    STP_WEAVE_ZIGZAG  +
    STP_WEAVE_ZIGZAG 
    STP_WEAVE_ASCENDING  +
    STP_WEAVE_ASCENDING 
    STP_WEAVE_DESCENDING  +
    STP_WEAVE_DESCENDING 
    STP_WEAVE_ASCENDING_2X  +
    STP_WEAVE_ASCENDING_2X 
    STP_WEAVE_STAGGERED  +
    STP_WEAVE_STAGGERED 
    STP_WEAVE_ASCENDING_3X  +
    STP_WEAVE_ASCENDING_3X 
    @@ -244,7 +244,7 @@ Softweave functions.

    Function Documentation

    -

    +

    @@ -272,7 +272,7 @@ Softweave functions.
    -

    +

    @@ -309,7 +309,7 @@ Softweave functions.
    -

    +

    @@ -346,7 +346,7 @@ Softweave functions.
    -

    +

    @@ -383,7 +383,7 @@ Softweave functions.
    -

    +

    @@ -420,7 +420,7 @@ Softweave functions.
    -

    +

    @@ -457,7 +457,7 @@ Softweave functions.
    -

    +

    @@ -590,7 +590,7 @@ Softweave functions.
    -

    +

    @@ -639,7 +639,7 @@ Softweave functions.
    -

    +

    @@ -677,7 +677,7 @@ Softweave functions.

    Variable Documentation

    -

    +

    @@ -700,7 +700,7 @@ Softweave functions.
    -

    +

    @@ -723,7 +723,7 @@ Softweave functions.
    -

    +

    @@ -746,7 +746,7 @@ Softweave functions.
    -

    +

    @@ -769,7 +769,7 @@ Softweave functions.
    -

    +

    @@ -792,7 +792,7 @@ Softweave functions.
    -

    +

    @@ -815,8 +815,8 @@ Softweave functions.
    -

    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html index 374e47b..34f8b40 100644 --- a/doc/gutenprint/html/xml_8h.html +++ b/doc/gutenprint/html/xml_8h.html @@ -3,7 +3,7 @@ libgutenprint API Reference: include/gutenprint/xml.h File Reference - +
    Main Page | Modules | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals | Related Pages
    include » gutenprint
    @@ -63,7 +63,7 @@ XML tree functions.

    Typedef Documentation

    -

    +

    @@ -87,7 +87,7 @@ XML tree functions.

    Function Documentation

    -

    +

    @@ -115,7 +115,7 @@ XML tree functions.
    -

    +

    @@ -143,7 +143,7 @@ XML tree functions.
    -

    +

    @@ -180,7 +180,7 @@ XML tree functions.
    -

    +

    @@ -208,7 +208,7 @@ XML tree functions.
    -

    +

    @@ -236,7 +236,7 @@ XML tree functions.
    -

    +

    @@ -264,7 +264,7 @@ XML tree functions.
    -

    +

    @@ -292,7 +292,7 @@ XML tree functions.
    -

    +

    @@ -320,7 +320,7 @@ XML tree functions.
    -

    +

    @@ -357,7 +357,7 @@ XML tree functions.
    -

    +

    @@ -385,7 +385,7 @@ XML tree functions.
    -

    +

    @@ -413,7 +413,7 @@ XML tree functions.
    -

    +

    @@ -441,7 +441,7 @@ XML tree functions.
    -

    +

    @@ -469,7 +469,7 @@ XML tree functions.
    -

    +

    @@ -497,7 +497,7 @@ XML tree functions.
    -

    +

    @@ -525,7 +525,7 @@ XML tree functions.
    -

    +

    @@ -553,7 +553,7 @@ XML tree functions.
    -

    +

    @@ -581,7 +581,7 @@ XML tree functions.
    -

    +

    @@ -609,7 +609,7 @@ XML tree functions.
    -

    +

    @@ -637,7 +637,7 @@ XML tree functions.
    -

    +

    @@ -665,7 +665,7 @@ XML tree functions.
    -

    +

    @@ -693,8 +693,8 @@ XML tree functions.
    -

    Generated on Sat Jul 2 09:45:09 2005 for libgutenprint API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprint API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/gutenprintui2.tag b/doc/gutenprintui2/gutenprintui2.tag index 77ca577..25a40e9 100644 --- a/doc/gutenprintui2/gutenprintui2.tag +++ b/doc/gutenprintui2/gutenprintui2.tag @@ -2,7 +2,7 @@ curve.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprintui2/ + /home/rlk/sandbox/print-4.3.x/include/gutenprintui2/ curve_8h _StpuiCurve _StpuiCurveClass @@ -141,7 +141,7 @@ gammacurve.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprintui2/ + /home/rlk/sandbox/print-4.3.x/include/gutenprintui2/ gammacurve_8h _StpuiGammaCurve _StpuiGammaCurveClass @@ -218,7 +218,7 @@ gutenprintui.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprintui2/ + /home/rlk/sandbox/print-4.3.x/include/gutenprintui2/ gutenprintui_8h gutenprintui2/curve.h gutenprintui2/gammacurve.h @@ -656,7 +656,7 @@ typebuiltins.h - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprintui2/ + /home/rlk/sandbox/print-4.3.x/include/gutenprintui2/ typebuiltins_8h #define @@ -1105,7 +1105,7 @@ include/gutenprintui2/ - /home/rleigh/gutenprint-5.0.0-rc1/include/gutenprintui2/ + /home/rlk/sandbox/print-4.3.x/include/gutenprintui2/ dir_000001.html curve.h gammacurve.h @@ -1114,7 +1114,7 @@ include/ - /home/rleigh/gutenprint-5.0.0-rc1/include/ + /home/rlk/sandbox/print-4.3.x/include/ dir_000000.html include/gutenprintui2/ diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html index 7a75739..594f09c 100644 --- a/doc/gutenprintui2/html/annotated.html +++ b/doc/gutenprintui2/html/annotated.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: Data Structures - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals

    libgutenprintui2 API Reference Data Structures

    Here are the data structures with brief descriptions: @@ -13,8 +13,8 @@
    _StpuiCurve
    stpui_image
    stpui_plist_t
    -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html index 2ce1ae7..6a5274e 100644 --- a/doc/gutenprintui2/html/classes.html +++ b/doc/gutenprintui2/html/classes.html @@ -3,15 +3,15 @@ libgutenprintui2 API Reference: Alphabetical List - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals

    libgutenprintui2 API Reference Data Structure Index

    _ | S

      _  
    		_StpuiCurveClass   _StpuiGammaCurveClass   stpui_image   stpui_plist_t   
    _StpuiCurve   _StpuiGammaCurve   
      S  

    _ | S

    -

    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html index f9db692..bcad7cd 100644 --- a/doc/gutenprintui2/html/curve_8h.html +++ b/doc/gutenprintui2/html/curve_8h.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: include/gutenprintui2/curve.h File Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    include » gutenprintui2
    @@ -59,7 +59,7 @@

    Define Documentation

    -

    +

    @@ -87,7 +87,7 @@
    -

    +

    @@ -115,7 +115,7 @@
    -

    +

    @@ -143,7 +143,7 @@
    -

    +

    @@ -171,7 +171,7 @@
    -

    +

    @@ -199,7 +199,7 @@
    -

    +

    @@ -223,7 +223,7 @@

    Typedef Documentation

    -

    +

    @@ -246,7 +246,7 @@
    -

    +

    @@ -270,7 +270,7 @@

    Enumeration Type Documentation

    -

    +

    @@ -292,11 +292,11 @@

    Enumerator:
    - - -
    STPUI_CURVE_TYPE_LINEAR  +
    STPUI_CURVE_TYPE_LINEAR 
    STPUI_CURVE_TYPE_SPLINE  +
    STPUI_CURVE_TYPE_SPLINE 
    STPUI_CURVE_TYPE_FREE  +
    STPUI_CURVE_TYPE_FREE 
    @@ -304,7 +304,7 @@

    Function Documentation

    -

    +

    @@ -332,7 +332,7 @@
    -

    +

    @@ -375,7 +375,7 @@
    -

    +

    @@ -403,7 +403,7 @@
    -

    +

    @@ -431,7 +431,7 @@
    -

    +

    @@ -468,7 +468,7 @@
    -

    +

    @@ -505,7 +505,7 @@
    -

    +

    @@ -560,7 +560,7 @@
    -

    +

    @@ -603,8 +603,8 @@
    -

    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/dir_000000.html b/doc/gutenprintui2/html/dir_000000.html index a363ef1..175001f 100644 --- a/doc/gutenprintui2/html/dir_000000.html +++ b/doc/gutenprintui2/html/dir_000000.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: include/ Directory Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    include
    @@ -13,8 +13,8 @@
    directory  gutenprintui2
    -

    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/dir_000001.html b/doc/gutenprintui2/html/dir_000001.html index 3489cc8..27f8eea 100644 --- a/doc/gutenprintui2/html/dir_000001.html +++ b/doc/gutenprintui2/html/dir_000001.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: include/gutenprintui2/ Directory Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    include » gutenprintui2
    @@ -19,8 +19,8 @@ file  typebuiltins.h -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/dirs.html b/doc/gutenprintui2/html/dirs.html index eb2b34e..5305057 100644 --- a/doc/gutenprintui2/html/dirs.html +++ b/doc/gutenprintui2/html/dirs.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: Directory Hierarchy - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals

    libgutenprintui2 API Reference Directories

    This directory hierarchy is sorted roughly, but not completely, alphabetically: -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html index 86191e9..e56f62a 100644 --- a/doc/gutenprintui2/html/files.html +++ b/doc/gutenprintui2/html/files.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: File Index - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals

    libgutenprintui2 API Reference File List

    Here is a list of all files with brief descriptions: @@ -11,8 +11,8 @@
    include/gutenprintui2/curve.h
    include/gutenprintui2/gutenprintui.h
    include/gutenprintui2/typebuiltins.h
    -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html index 5e75be7..a90477c 100644 --- a/doc/gutenprintui2/html/functions.html +++ b/doc/gutenprintui2/html/functions.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: Data Fields - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    All | Variables
    _ | a | b | c | e | g | h | i | l | m | n | o | p | q | r | s | t | u | v
    @@ -98,8 +98,8 @@ Here is a list of all struct and union fields with links to the structures/union : stpui_plist_t
  • vbox : _StpuiGammaCurve
  • vflip : stpui_image -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html index f881c75..f7a1492 100644 --- a/doc/gutenprintui2/html/functions_vars.html +++ b/doc/gutenprintui2/html/functions_vars.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: Data Fields - Variables - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    All | Variables
    _ | a | b | c | e | g | h | i | l | m | n | o | p | q | r | s | t | u | v
    @@ -98,8 +98,8 @@ : stpui_plist_t
  • vbox : _StpuiGammaCurve
  • vflip : stpui_image -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html index c3ba173..af33798 100644 --- a/doc/gutenprintui2/html/gammacurve_8h.html +++ b/doc/gutenprintui2/html/gammacurve_8h.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: include/gutenprintui2/gammacurve.h File Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    include » gutenprintui2
    @@ -41,7 +41,7 @@

    Define Documentation

    -

    +

    @@ -69,7 +69,7 @@
    -

    +

    @@ -97,7 +97,7 @@
    -

    +

    @@ -125,7 +125,7 @@
    -

    +

    @@ -153,7 +153,7 @@
    -

    +

    @@ -181,7 +181,7 @@
    -

    +

    @@ -205,7 +205,7 @@

    Typedef Documentation

    -

    +

    @@ -228,7 +228,7 @@
    -

    +

    @@ -252,7 +252,7 @@

    Function Documentation

    -

    +

    @@ -280,7 +280,7 @@
    -

    +

    @@ -308,8 +308,8 @@
    -

    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html index 3017fac..ea9c040 100644 --- a/doc/gutenprintui2/html/globals.html +++ b/doc/gutenprintui2/html/globals.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: Data Fields - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    c | g | o | s
    @@ -119,8 +119,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : curve.h
  • StpuiGammaCurve : gammacurve.h
  • StpuiGammaCurveClass : gammacurve.h -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html index c3934f5..38c417b 100644 --- a/doc/gutenprintui2/html/globals_defs.html +++ b/doc/gutenprintui2/html/globals_defs.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: Data Fields - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    @@ -25,8 +25,8 @@ : typebuiltins.h
  • STPUI_TYPE_GAMMA_CURVE : gammacurve.h
  • STPUI_TYPE_ORIENT_T : typebuiltins.h -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html index b437b0c..d2eec90 100644 --- a/doc/gutenprintui2/html/globals_enum.html +++ b/doc/gutenprintui2/html/globals_enum.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: Data Fields - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    @@ -13,8 +13,8 @@ : gutenprintui.h
  • orient_t : gutenprintui.h
  • StpuiCurveType : curve.h -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html index 598f52f..94191f3 100644 --- a/doc/gutenprintui2/html/globals_eval.html +++ b/doc/gutenprintui2/html/globals_eval.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: Data Fields - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    @@ -21,8 +21,8 @@ : curve.h
  • STPUI_CURVE_TYPE_LINEAR : curve.h
  • STPUI_CURVE_TYPE_SPLINE : curve.h -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html index c04cefe..d8fd9f1 100644 --- a/doc/gutenprintui2/html/globals_func.html +++ b/doc/gutenprintui2/html/globals_func.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: Data Fields - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    c | o | s
    @@ -82,8 +82,8 @@ : gutenprintui.h
  • stpui_set_thumbnail_data() : gutenprintui.h
  • stpui_set_thumbnail_func() : gutenprintui.h -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html index ea2abdf..3c1827b 100644 --- a/doc/gutenprintui2/html/globals_type.html +++ b/doc/gutenprintui2/html/globals_type.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: Data Fields - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    All | Functions | Typedefs | Enumerations | Enumerator | Defines
    @@ -16,8 +16,8 @@ : curve.h
  • StpuiGammaCurve : gammacurve.h
  • StpuiGammaCurveClass : gammacurve.h -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html index a5db95f..67f489b 100644 --- a/doc/gutenprintui2/html/gutenprintui_8h.html +++ b/doc/gutenprintui2/html/gutenprintui_8h.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: include/gutenprintui2/gutenprintui.h File Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    include » gutenprintui2
    @@ -147,7 +147,7 @@

    Typedef Documentation

    -

    +

    @@ -170,7 +170,7 @@
    -

    +

    @@ -194,7 +194,7 @@

    Enumeration Type Documentation

    -

    +

    @@ -216,18 +216,18 @@

    Enumerator:
    - - -
    COMMAND_TYPE_DEFAULT  +
    COMMAND_TYPE_DEFAULT 
    COMMAND_TYPE_CUSTOM  +
    COMMAND_TYPE_CUSTOM 
    COMMAND_TYPE_FILE  +
    COMMAND_TYPE_FILE 
    -

    +

    @@ -249,15 +249,15 @@

    Enumerator:
    - - - - -
    ORIENT_AUTO  +
    ORIENT_AUTO 
    ORIENT_PORTRAIT  +
    ORIENT_PORTRAIT 
    ORIENT_LANDSCAPE  +
    ORIENT_LANDSCAPE 
    ORIENT_UPSIDEDOWN  +
    ORIENT_UPSIDEDOWN 
    ORIENT_SEASCAPE  +
    ORIENT_SEASCAPE 
    @@ -265,7 +265,7 @@

    Function Documentation

    -

    +

    @@ -302,7 +302,7 @@
    -

    +

    @@ -330,7 +330,7 @@
    -

    +

    @@ -358,7 +358,7 @@
    -

    +

    @@ -386,7 +386,7 @@
    -

    +

    @@ -414,7 +414,7 @@
    -

    +

    @@ -442,7 +442,7 @@
    -

    +

    @@ -470,7 +470,7 @@
    -

    +

    @@ -498,7 +498,7 @@
    -

    +

    @@ -526,7 +526,7 @@
    -

    +

    @@ -554,7 +554,7 @@
    -

    +

    @@ -582,7 +582,7 @@
    -

    +

    @@ -610,7 +610,7 @@
    -

    +

    @@ -647,7 +647,7 @@
    -

    +

    @@ -684,7 +684,7 @@
    -

    +

    @@ -712,7 +712,7 @@
    -

    +

    @@ -740,7 +740,7 @@
    -

    +

    @@ -768,7 +768,7 @@
    -

    +

    @@ -796,7 +796,7 @@
    -

    +

    @@ -824,7 +824,7 @@
    -

    +

    @@ -852,7 +852,7 @@
    -

    +

    @@ -880,7 +880,7 @@
    -

    +

    @@ -908,7 +908,7 @@
    -

    +

    @@ -945,7 +945,7 @@
    -

    +

    @@ -982,7 +982,7 @@
    -

    +

    @@ -1019,7 +1019,7 @@
    -

    +

    @@ -1062,7 +1062,7 @@
    -

    +

    @@ -1099,7 +1099,7 @@
    -

    +

    @@ -1142,7 +1142,7 @@
    -

    +

    @@ -1179,7 +1179,7 @@
    -

    +

    @@ -1222,7 +1222,7 @@
    -

    +

    @@ -1259,7 +1259,7 @@
    -

    +

    @@ -1302,7 +1302,7 @@
    -

    +

    @@ -1339,7 +1339,7 @@
    -

    +

    @@ -1382,7 +1382,7 @@
    -

    +

    @@ -1419,7 +1419,7 @@
    -

    +

    @@ -1462,7 +1462,7 @@
    -

    +

    @@ -1499,7 +1499,7 @@
    -

    +

    @@ -1527,7 +1527,7 @@
    -

    +

    @@ -1555,7 +1555,7 @@
    -

    +

    @@ -1583,7 +1583,7 @@
    -

    +

    @@ -1611,7 +1611,7 @@
    -

    +

    @@ -1639,7 +1639,7 @@
    -

    +

    @@ -1676,7 +1676,7 @@
    -

    +

    @@ -1704,7 +1704,7 @@
    -

    +

    @@ -1741,7 +1741,7 @@
    -

    +

    @@ -1769,7 +1769,7 @@
    -

    +

    @@ -1797,7 +1797,7 @@
    -

    +

    @@ -1834,7 +1834,7 @@
    -

    +

    @@ -1862,7 +1862,7 @@
    -

    +

    @@ -1890,7 +1890,7 @@
    -

    +

    @@ -1918,7 +1918,7 @@
    -

    +

    @@ -1946,8 +1946,8 @@
    -

    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html index 93ee5e3..b25464d 100644 --- a/doc/gutenprintui2/html/index.html +++ b/doc/gutenprintui2/html/index.html @@ -3,12 +3,12 @@ libgutenprintui2 API Reference: Main Page - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals

    libgutenprintui2 API Reference Documentation

    -

    5.0.0-rc1

    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +

    5.0.0-rc1

    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html index 0fb5b48..34fc282 100644 --- a/doc/gutenprintui2/html/struct__StpuiCurve.html +++ b/doc/gutenprintui2/html/struct__StpuiCurve.html @@ -3,9 +3,9 @@ libgutenprintui2 API Reference: _StpuiCurve Struct Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    -

    _StpuiCurve Struct Reference

    #include <curve.h> +

    _StpuiCurve Struct Reference

    #include <curve.h>

    @@ -42,7 +42,7 @@

    Field Documentation

    -

    +

    @@ -65,7 +65,7 @@
    -

    +

    @@ -88,7 +88,7 @@
    -

    +

    @@ -111,7 +111,7 @@
    -

    +

    @@ -134,7 +134,7 @@
    -

    +

    @@ -157,7 +157,7 @@
    -

    +

    @@ -180,7 +180,7 @@
    -

    +

    @@ -203,7 +203,7 @@
    -

    +

    @@ -226,7 +226,7 @@
    -

    +

    @@ -249,7 +249,7 @@
    -

    +

    @@ -272,7 +272,7 @@
    -

    +

    @@ -295,7 +295,7 @@
    -

    +

    @@ -318,7 +318,7 @@
    -

    +

    @@ -341,7 +341,7 @@
    -

    +

    @@ -364,7 +364,7 @@
    -

    +

    @@ -389,8 +389,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html index b37b862..b963a60 100644 --- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html +++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html @@ -3,9 +3,9 @@ libgutenprintui2 API Reference: _StpuiCurveClass Struct Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    -

    _StpuiCurveClass Struct Reference

    #include <curve.h> +

    _StpuiCurveClass Struct Reference

    #include <curve.h>

    @@ -24,7 +24,7 @@

    Field Documentation

    -

    +

    @@ -47,7 +47,7 @@
    -

    +

    @@ -70,7 +70,7 @@
    -

    +

    @@ -93,7 +93,7 @@
    -

    +

    @@ -116,7 +116,7 @@
    -

    +

    @@ -139,7 +139,7 @@
    -

    +

    @@ -164,8 +164,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html index 7e7e74e..7b40e99 100644 --- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html +++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html @@ -3,9 +3,9 @@ libgutenprintui2 API Reference: _StpuiGammaCurve Struct Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    -

    _StpuiGammaCurve Struct Reference

    #include <gammacurve.h> +

    _StpuiGammaCurve Struct Reference

    #include <gammacurve.h>

    @@ -26,7 +26,7 @@

    Field Documentation

    -

    +

    @@ -49,7 +49,7 @@
    -

    +

    @@ -72,7 +72,7 @@
    -

    +

    @@ -95,7 +95,7 @@
    -

    +

    @@ -118,7 +118,7 @@
    -

    +

    @@ -141,7 +141,7 @@
    -

    +

    @@ -164,7 +164,7 @@
    -

    +

    @@ -189,8 +189,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html index fa85d0e..e2174d2 100644 --- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html +++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html @@ -3,9 +3,9 @@ libgutenprintui2 API Reference: _StpuiGammaCurveClass Struct Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    -

    _StpuiGammaCurveClass Struct Reference

    #include <gammacurve.h> +

    _StpuiGammaCurveClass Struct Reference

    #include <gammacurve.h>

    @@ -22,7 +22,7 @@

    Field Documentation

    -

    +

    @@ -45,7 +45,7 @@
    -

    +

    @@ -68,7 +68,7 @@
    -

    +

    @@ -91,7 +91,7 @@
    -

    +

    @@ -114,7 +114,7 @@
    -

    +

    @@ -139,8 +139,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html index e1d6e7c..53a954e 100644 --- a/doc/gutenprintui2/html/structstpui__image.html +++ b/doc/gutenprintui2/html/structstpui__image.html @@ -3,9 +3,9 @@ libgutenprintui2 API Reference: stpui_image Struct Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    -

    stpui_image Struct Reference

    #include <gutenprintui.h> +

    stpui_image Struct Reference

    #include <gutenprintui.h>

    @@ -28,7 +28,7 @@

    Field Documentation

    -

    +

    @@ -51,7 +51,7 @@
    -

    +

    @@ -74,7 +74,7 @@
    -

    +

    @@ -97,7 +97,7 @@
    -

    +

    @@ -120,7 +120,7 @@
    -

    +

    @@ -143,7 +143,7 @@
    -

    +

    @@ -166,7 +166,7 @@
    -

    +

    @@ -189,7 +189,7 @@
    -

    +

    @@ -214,8 +214,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html index 5cca4a3..006f279 100644 --- a/doc/gutenprintui2/html/structstpui__plist__t.html +++ b/doc/gutenprintui2/html/structstpui__plist__t.html @@ -3,9 +3,9 @@ libgutenprintui2 API Reference: stpui_plist_t Struct Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    -

    stpui_plist_t Struct Reference

    #include <gutenprintui.h> +

    stpui_plist_t Struct Reference

    #include <gutenprintui.h>

    @@ -38,7 +38,7 @@

    Field Documentation

    -

    +

    @@ -61,7 +61,7 @@
    -

    +

    @@ -84,7 +84,7 @@
    -

    +

    @@ -107,7 +107,7 @@
    -

    +

    @@ -130,7 +130,7 @@
    -

    +

    @@ -153,7 +153,7 @@
    -

    +

    @@ -176,7 +176,7 @@
    -

    +

    @@ -199,7 +199,7 @@
    -

    +

    @@ -222,7 +222,7 @@
    -

    +

    @@ -245,7 +245,7 @@
    -

    +

    @@ -268,7 +268,7 @@
    -

    +

    @@ -291,7 +291,7 @@
    -

    +

    @@ -314,7 +314,7 @@
    -

    +

    @@ -339,8 +339,8 @@

    The documentation for this struct was generated from the following file: -
    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html index 2d3d0b2..ddbe896 100644 --- a/doc/gutenprintui2/html/typebuiltins_8h.html +++ b/doc/gutenprintui2/html/typebuiltins_8h.html @@ -3,7 +3,7 @@ libgutenprintui2 API Reference: include/gutenprintui2/typebuiltins.h File Reference - +
    Main Page | Alphabetical List | Data Structures | Directories | File List | Data Fields | Globals
    include » gutenprintui2
    @@ -26,7 +26,7 @@

    Define Documentation

    -

    +

    @@ -49,7 +49,7 @@
    -

    +

    @@ -72,7 +72,7 @@
    -

    +

    @@ -96,7 +96,7 @@

    Function Documentation

    -

    +

    @@ -124,7 +124,7 @@
    -

    +

    @@ -152,7 +152,7 @@
    -

    +

    @@ -180,8 +180,8 @@
    -

    Generated on Sat Jul 2 09:45:12 2005 for libgutenprintui2 API Reference by  +
    Generated on Fri Jul 15 19:52:20 2005 for libgutenprintui2 API Reference by  -doxygen 1.4.3-20050530
    +doxygen 1.4.3
    diff --git a/doc/users_guide/Makefile.in b/doc/users_guide/Makefile.in index 424c245..10f8e83 100644 --- a/doc/users_guide/Makefile.in +++ b/doc/users_guide/Makefile.in @@ -252,7 +252,6 @@ 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@ diff --git a/doc/users_guide/html/a630.html b/doc/users_guide/html/a630.html deleted file mode 100644 index 5900395..0000000 --- a/doc/users_guide/html/a630.html +++ /dev/null @@ -1,181 +0,0 @@ - -GNU Free Documentation License
    The User's Guide to Gutenprint - Complete Edition
    PrevNext

    Appendix A. GNU Free Documentation License

    Version 1.1, March 2000

    Copyright (C) 2000 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed.

    0. PREAMBLE

    The purpose of this License is to make a manual, textbook, - or other written document "free" in the sense of freedom: to - assure everyone the effective freedom to copy and redistribute it, - with or without modifying it, either commercially or - noncommercially. Secondarily, this License preserves for the - author and publisher a way to get credit for their work, while not - being considered responsible for modifications made by - others.

    This License is a kind of "copyleft", which means that - derivative works of the document must themselves be free in the - same sense. It complements the GNU General Public License, which - is a copyleft license designed for free software.

    We have designed this License in order to use it for manuals - for free software, because free software needs free documentation: - a free program should come with manuals providing the same - freedoms that the software does. But this License is not limited - to software manuals; it can be used for any textual work, - regardless of subject matter or whether it is published as a - printed book. We recommend this License principally for works - whose purpose is instruction or reference.

    PrevHomeNext
    Gutenprint Utilities APPLICABILITY AND DEFINITIONS
    \ No newline at end of file diff --git a/doc/users_guide/html/book1.html b/doc/users_guide/html/book1.html new file mode 100644 index 0000000..15d9f2e --- /dev/null +++ b/doc/users_guide/html/book1.html @@ -0,0 +1,487 @@ + +The User's Guide to Gutenprint - Complete Edition

    The User's Guide to Gutenprint - Complete Edition

    Andy Stewart

    Copyright © 2002 Andy Stewart

    The Gutenprint Top Quality Printer Drivers (hereafter +called Gutenprint) are a set of printer drivers written to +take advantage of the full capabilities of a wide range of +printers. These drivers should work on any POSIX compliant operating +system (e.g. Linux, Solaris, IRIX, etc). This document will explain how to +use the Gutenprint software to achieve high quality printouts from the +GIMP (GNU Image +Manipulation Program) and +CUPS (Common Unix Printing +System). +

    Please note that in addition to using the Gutenprint software as a +print plugin for the GIMP, and as a set of printer drivers for CUPS, this +software can also be compiled and used with the +Ghostscript software +and with the +Foomatic +software. +

    Regardless of whether the Gutenprint software is used with the GIMP, +CUPS, Ghostscript, or Foomatic, the print quality and printer settings +remain the same. However, use of the Gutenprint with Ghostscript and +Foomatic is not covered in this document. These topics may be covered +in a future revision of this document. +

    This document corresponds to version 4.2.0 and later of the Gutenprint +software. This document will serve as a guide to the user, and as such +will not explain how to install Gutenprint, CUPS, GIMP, Ghostscript, +Foomatic, or any other related software. +

    Andy Stewart, the author, is the founder of the +Worcester Linux Users' Group in +Worcester, Massachusetts, USA. The group was founded in July 1997 and has +approximately 140 people on its mailing list. Monthly meetings are +held and all are invited. +

    In terms of "code", this is the author's first contribution to the +open source community, and definitely his first experience with DocBook. +Constructive comments, praise, words of encouragement, and the like +will be most appreciated if e-mailed to the +author. +

    Table of Contents
    1. Project History
    2. GIMP and Gutenprint
    Running the GIMP
    The Gimp-Print Graphical User Interface
    Printer Settings
    Preview
    Position
    Size
    Image/Output Settings
    Printing and Saving Settings
    3. CUPS and Gutenprint
    Introduction
    CUPS Printer Installation
    Configuring your Printer in CUPS
    Using CUPS from the Command Line
    4. Gutenprint Utilities
    escputil
    Determining Ink Level
    Error During Ink Level Determination
    Nozzle Check
    Clean the Print Head
    Align the Print Head
    Printer Identification
    More Information
    A. GNU Free Documentation License
    0. PREAMBLE
    1. APPLICABILITY AND DEFINITIONS
    2. VERBATIM COPYING
    3. COPYING IN QUANTITY
    4. MODIFICATIONS
    5. COMBINING DOCUMENTS
    6. COLLECTIONS OF DOCUMENTS
    7. AGGREGATION WITH INDEPENDENT WORKS
    8. TRANSLATION
    9. TERMINATION
    10. FUTURE REVISIONS OF THIS LICENSE
    How to use this License for your documents
      Next
      Project History
    \ No newline at end of file diff --git a/doc/users_guide/html/c29.html b/doc/users_guide/html/c29.html index d20e203..e178bd0 100644 --- a/doc/users_guide/html/c29.html +++ b/doc/users_guide/html/c29.html @@ -1,27 +1,24 @@ - + Project History
    PrevNextPrevHomeNext +CUPS and Gutenprint
    Chapter 3. CUPS and Gutenprint

    3.1. IntroductionIntroduction

    CUPS is an acronym which stands for Home + Gutenprint Utilities

    Next4.1. escputilescputil

    Caution
     

    The 4.1.1. Determining Ink LevelDetermining Ink Level

    Perhaps the most basic function performed by @@ -210,6 +195,12 @@ URI". The author's USB printer is listed as "Device URI: usb:/dev/usb/lp0". specified as /dev/usb/lp0. To get the ink level for this printer, issue this command and notice the output. 

      
@@ -230,6 +221,9 @@ under certain conditions; type 'escputil -l' for details.
        Light Magenta     70

    The user would substitute their own raw printer device for the one shown in the example after the "-r" switch. Notice that the printout @@ -246,7 +240,7 @@ CLASS="SECT2" CLASS="SECT2" >4.1.2. Error During Ink Level DeterminationError During Ink Level Determination

    What? The example above did not work? An error message was @@ -255,7 +249,13 @@ depending on the specific error message. If the error message is "Invalid argument" (see following example), the problem is that the 2.4.x kernel is not configured with the CONFIG_PARPORT_1284 option enabled. - 

      
 # escputil -r /dev/lp0 -i
@@ -269,6 +269,9 @@ under certain conditions; type 'escputil -l' for details.
 Cannot read from /dev/lp0: Invalid argument
     
   
    
 
      Another possibile cause for error is that the raw printer device
@@ -285,7 +288,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 >4.1.3. Nozzle CheckNozzle Check
           On an inkjet printer, there are several small holes on the
@@ -307,6 +310,12 @@ or spaces in these lines, then the corresponding nozzle is clogged and
 the print head must be cleaned.  However, if there are no gaps, the 
 nozzles are clean.
      
      
@@ -320,6 +329,9 @@ under certain conditions; type 'escputil -l' for details.
 Running nozzle check, please ensure paper is in the printer.
     
   
    4.1.4. Clean the Print HeadClean the Print Head
           If the printed output is showing gaps where there should have
@@ -341,6 +353,12 @@ printers present, the desired printer must be specified with an
 additional "-P printer_name" switch, where "printer_name" is the name
 of the desired printer.
      
      
@@ -354,6 +372,9 @@ under certain conditions; type 'escputil -l' for details.
 Cleaning heads...
     
   
           Nothing will be printed on the paper.  The printer will make
 some noise as it cleans the print head.  Wait until the printer is
@@ -376,7 +397,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 >4.1.5. Align the Print HeadAlign the Print Head
           To insure the highest quality printouts, the print head must
@@ -408,30 +429,18 @@ CLASS="CAUTION"
 >
    Next
-GIMP and Gutenprint
    Caution
     
    This utility lets you align the print head of your Epson Stylus inkjet
 printer.  Misuse of this utility may cause your print quality to degrade
@@ -456,6 +465,12 @@ line.  (To obtain a list of printer models, issue the "escputil -M"
 command).  Of course, your responses will vary and should be
 substituted for the responses shown in the following example.
      
      
@@ -549,11 +564,20 @@ About to save settings...succeeded!
 Your alignment settings have been saved to the printer.
     
   
          The following example shows what will happen if an unprivileged
 user attempts to align the print head by specifying the raw printer
 device on the command line.
     
      
@@ -568,12 +592,21 @@ Attempting to detect printer model...
 Cannot open /dev/usb/lp0 read/write: Permission denied
     
   
          This next example illustrates the results obtained when the root
 user issues an alignment command while specifying the raw printer
 device.  Note that the output is truncated and only shows the printer
 detection output.
     
      
@@ -589,6 +622,9 @@ Attempting to detect printer model...Stylus Photo 870
 Please read these instructions very carefully before proceeding.
     
   
    4.1.6. Printer IdentificationPrinter Identification
           The printer identification command will query the printer for
@@ -606,6 +642,12 @@ Substitute your own raw printer device in place of the /dev/usb/lp0
 shown in the example.  The output will vary depending on the precise
 printer model.
      
      
@@ -621,6 +663,9 @@ MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Photo 870;CLS:PRINTER;DES:
 EPSON Stylus Photo 870;
     
   
    4.1.7. More InformationMore Information
           For more detailed information about the command line switches
@@ -671,7 +716,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 >Home
    The User's Guide to Gutenprint - Complete Edition
    PrevNext
    Chapter 2. GIMP and Gutenprint
    2.1. Running the GIMP
       This section assumes that you have the GIMP version 1.2 installed
-and working properly on your computer, and that you have an image of
-some type that you desire to print. To get started quickly, log into
-your system, start the X window system, and bring up your favorite terminal
-window.  At the $ prompt, type:
-
-  
      
-     $ gimp &
-    
-  
    
-
-   This should start the GIMP for you. If it does not, check that
-you have installed the GIMP properly, and that its binary is located
-in one of the directories listed in your $PATH environment
-variable. On the assumption that this worked, the screen should now
-look something like this:
-
-   
    Figure 2-1. The Startup Window for The GIMP
    
-
-   
       At this point, you should use the
-
-    File->Open
-
-menu option to open your favorite picture. We will print this picture
-shortly. Your picture should be displayed next to the GIMP startup
-window, perhaps looking similar to the following (sssh! Don't tell
-anybody the secret!):
-
-   
    Figure 2-2. A Sample Image Displayed by The GIMP
    
-
-  
    PrevHomeNext
    Project History The Gimp-Print Graphical User Interface
    
\ No newline at end of file
diff --git a/doc/users_guide/html/ch-gimp-and-gimp-print.html b/doc/users_guide/html/ch-gimp-and-gimp-print.html
new file mode 100644
index 0000000..e557aea
--- /dev/null
+++ b/doc/users_guide/html/ch-gimp-and-gimp-print.html
@@ -0,0 +1,245 @@
+
+GIMP and Gutenprint
    The User's Guide to Gutenprint - Complete Edition
    PrevNext
    Chapter 2. GIMP and Gutenprint
    Running the GIMP
       This section assumes that you have the GIMP version 1.2 installed
+and working properly on your computer, and that you have an image of
+some type that you desire to print. To get started quickly, log into
+your system, start the X window system, and bring up your favorite terminal
+window.  At the $ prompt, type:
+
+  
      
+     $ gimp &
+    
+  
    
+
+   This should start the GIMP for you. If it does not, check that
+you have installed the GIMP properly, and that its binary is located
+in one of the directories listed in your $PATH environment
+variable. On the assumption that this worked, the screen should now
+look something like this:
+
+   
    Figure 2-1. The Startup Window for The GIMP
    
+
+   
       At this point, you should use the
+
+    File->Open
+
+menu option to open your favorite picture. We will print this picture
+shortly. Your picture should be displayed next to the GIMP startup
+window, perhaps looking similar to the following (sssh! Don't tell
+anybody the secret!):
+
+   
    Figure 2-2. A Sample Image Displayed by The GIMP
    
+
+  
    PrevHomeNext
    Project History The Gimp-Print Graphical User Interface
    
\ No newline at end of file
diff --git a/doc/users_guide/html/docbook.css b/doc/users_guide/html/docbook.css
new file mode 100644
index 0000000..0f90516
--- /dev/null
+++ b/doc/users_guide/html/docbook.css
@@ -0,0 +1,12 @@
+.NAVHEADER { display: none }
+.NAVFOOTER { display: none }
+.TOC       { display: none }
+
+.NAVTOC    { margin-left: 15;
+             display: none }
+
+.NAVBTN    { font-size: 10pt }
+
+.TOCTITLE  { font-size: 10pt;
+             color: blue;
+ 	     text-decoration: underline; }
diff --git a/doc/users_guide/html/gfdl.html b/doc/users_guide/html/gfdl.html
new file mode 100644
index 0000000..c70ea3c
--- /dev/null
+++ b/doc/users_guide/html/gfdl.html
@@ -0,0 +1,247 @@
+
+GNU Free Documentation License
    The User's Guide to Gutenprint - Complete Edition
    PrevNext
    Appendix A. GNU Free Documentation License
    Version 1.1, March 2000
    Copyright (C) 2000  Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
    0. PREAMBLE
    The purpose of this License is to make a manual, textbook,
+    or other written document "free" in the sense of freedom: to
+    assure everyone the effective freedom to copy and redistribute it,
+    with or without modifying it, either commercially or
+    noncommercially.  Secondarily, this License preserves for the
+    author and publisher a way to get credit for their work, while not
+    being considered responsible for modifications made by
+    others.
    This License is a kind of "copyleft", which means that
+    derivative works of the document must themselves be free in the
+    same sense.  It complements the GNU General Public License, which
+    is a copyleft license designed for free software.
    We have designed this License in order to use it for manuals
+    for free software, because free software needs free documentation:
+    a free program should come with manuals providing the same
+    freedoms that the software does.  But this License is not limited
+    to software manuals; it can be used for any textual work,
+    regardless of subject matter or whether it is published as a
+    printed book.  We recommend this License principally for works
+    whose purpose is instruction or reference.
    PrevHomeNext
    Gutenprint Utilities APPLICABILITY AND DEFINITIONS
    
\ No newline at end of file
diff --git a/doc/users_guide/html/index.html b/doc/users_guide/html/index.html
deleted file mode 100644
index 4563d68..0000000
--- a/doc/users_guide/html/index.html
+++ /dev/null
@@ -1,511 +0,0 @@
-
-The User's Guide to Gutenprint - Complete Edition
    The User's Guide to Gutenprint - Complete Edition
    Andy Stewart
    Copyright © 2002 Andy Stewart
        The Gutenprint Top Quality Printer Drivers (hereafter
-called Gutenprint) are a set of printer drivers written to
-take advantage of the full capabilities of a wide range of
-printers. These drivers should work on any POSIX compliant operating
-system (e.g. Linux, Solaris, IRIX, etc).  This document will explain how to
-use the Gutenprint software to achieve high quality printouts from the
-GIMP (GNU Image
-Manipulation Program) and
-CUPS (Common Unix Printing
-System).
-  
        Please note that in addition to using the Gutenprint software as a
-print plugin for the GIMP, and as a set of printer drivers for CUPS, this
-software can also be compiled and used with the 
-Ghostscript software
-and with the 
-Foomatic 
-software.
-   
    Regardless of whether the Gutenprint software is used with the GIMP,
-CUPS, Ghostscript, or Foomatic, the print quality and printer settings
-remain the same.  However, use of the Gutenprint with Ghostscript and
-Foomatic is not covered in this document.  These topics may be covered
-in a future revision of this document.
-  
      This document corresponds to version 4.2.0 and later of the Gutenprint
-software. This document will serve as a guide to the user, and as such
-will not explain how to install Gutenprint, CUPS, GIMP, Ghostscript,
-Foomatic, or any other related software.
-  
        Andy Stewart, the author, is the founder of the
-Worcester Linux Users' Group in
-Worcester, Massachusetts, USA.  The group was founded in July 1997 and has
-approximately 140 people on its mailing list.  Monthly meetings are
-held and all are invited.
-  
        In terms of "code", this is the author's first contribution to the
-open source community, and definitely his first experience with DocBook.
-Constructive comments, praise, words of encouragement, and the like
-will be most appreciated if e-mailed to the
-author.
-  
    The User's Guide to Gutenprint - Complete Edition,
-Copyright 2002, Andy Stewart. 
-    
        Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-Version 1.1 or any later version published by the Free Software
-Foundation with no invariant sections, no Front-Cover texts, and no
-Back-Cover texts.  A copy of the license is included in Appendix A.
-    
    Table of Contents
    1. Project History
    2. GIMP and Gutenprint
    2.1. Running the GIMP
    2.2. The Gimp-Print Graphical User Interface
    2.2.1. Printer Settings
    2.2.2. Preview
    2.2.3. Position
    2.2.4. Size
    2.2.5. Image/Output Settings
    2.2.6. Printing and Saving Settings
    3. CUPS and Gutenprint
    3.1. Introduction
    3.2. CUPS Printer Installation
    3.3. Configuring your Printer in CUPS
    3.4. Using CUPS from the Command Line
    4. Gutenprint Utilities
    4.1. escputil
    4.1.1. Determining Ink Level
    4.1.2. Error During Ink Level Determination
    4.1.3. Nozzle Check
    4.1.4. Clean the Print Head
    4.1.5. Align the Print Head
    4.1.6. Printer Identification
    4.1.7. More Information
    A. GNU Free Documentation License
    0. PREAMBLE
    1. APPLICABILITY AND DEFINITIONS
    2. VERBATIM COPYING
    3. COPYING IN QUANTITY
    4. MODIFICATIONS
    5. COMBINING DOCUMENTS
    6. COLLECTIONS OF DOCUMENTS
    7. AGGREGATION WITH INDEPENDENT WORKS
    8. TRANSLATION
    9. TERMINATION
    10. FUTURE REVISIONS OF THIS LICENSE
    How to use this License for your documents
      Next
      Project History
    
\ No newline at end of file
diff --git a/doc/users_guide/html/ln12.html b/doc/users_guide/html/ln12.html
new file mode 100644
index 0000000..737b50d
--- /dev/null
+++ b/doc/users_guide/html/ln12.html
@@ -0,0 +1,93 @@
+
+
    The User's Guide to Gutenprint - Complete Edition
    The User's Guide to Gutenprint - Complete Edition,
+Copyright 2002, Andy Stewart. 
+    
        Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.1 or any later version published by the Free Software
+Foundation with no invariant sections, no Front-Cover texts, and no
+Back-Cover texts.  A copy of the license is included in Appendix A.
+    
     Home 
    
\ No newline at end of file
diff --git a/doc/users_guide/html/stylesheet-images/caution.gif b/doc/users_guide/html/stylesheet-images/caution.gif
new file mode 100644
index 0000000..9cc2e15
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/caution.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/home.gif b/doc/users_guide/html/stylesheet-images/home.gif
new file mode 100644
index 0000000..55e1d59
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/home.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/important.gif b/doc/users_guide/html/stylesheet-images/important.gif
new file mode 100644
index 0000000..25e40c7
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/important.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/next.gif b/doc/users_guide/html/stylesheet-images/next.gif
new file mode 100644
index 0000000..8c502e7
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/next.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/note.gif b/doc/users_guide/html/stylesheet-images/note.gif
new file mode 100644
index 0000000..7322e8e
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/note.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/prev.gif b/doc/users_guide/html/stylesheet-images/prev.gif
new file mode 100644
index 0000000..0894d9e
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/prev.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/tip.gif b/doc/users_guide/html/stylesheet-images/tip.gif
new file mode 100644
index 0000000..f062955
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/tip.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/toc-blank.gif b/doc/users_guide/html/stylesheet-images/toc-blank.gif
new file mode 100644
index 0000000..6c65e3a
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/toc-blank.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/toc-minus.gif b/doc/users_guide/html/stylesheet-images/toc-minus.gif
new file mode 100644
index 0000000..40ebe61
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/toc-minus.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/toc-plus.gif b/doc/users_guide/html/stylesheet-images/toc-plus.gif
new file mode 100644
index 0000000..3e9e7d5
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/toc-plus.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/up.gif b/doc/users_guide/html/stylesheet-images/up.gif
new file mode 100644
index 0000000..e899a27
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/up.gif differ
diff --git a/doc/users_guide/html/stylesheet-images/warning.gif b/doc/users_guide/html/stylesheet-images/warning.gif
new file mode 100644
index 0000000..a587079
Binary files /dev/null and b/doc/users_guide/html/stylesheet-images/warning.gif differ
diff --git a/doc/users_guide/html/x452.html b/doc/users_guide/html/x452.html
index ce48444..ef5aebb 100644
--- a/doc/users_guide/html/x452.html
+++ b/doc/users_guide/html/x452.html
@@ -1,14 +1,14 @@
-
+
 CUPS Printer Installation
    3.2. CUPS Printer InstallationCUPS Printer Installation
    This explanation will use the web interface provided by CUPS. First,
@@ -215,30 +212,18 @@ CLASS="CAUTION"
 >
    
+Configuring your Printer in CUPS
    Caution Regarding USB Printers
     
    CUPS versions 1.1.11 and later Home
    		
 
    3.3. Configuring your Printer in CUPSConfiguring your Printer in CUPS
    With reference to Home
+
 Using CUPS from the Command Line
    3.4. Using CUPS from the Command LineUsing CUPS from the Command Line
        It is possible to use the CUPS printing system from the command
@@ -95,7 +92,13 @@ command line.
 >When using CUPS from the command line, the command will have this
 general format:
 
-   
       
      lpr -P my_printer_name \
@@ -104,6 +107,9 @@ CLASS="PROGRAMLISTING"
          /path/to/printfile
      
    
    
 
 When typing the command directly onto the command line, put all of the
@@ -111,7 +117,13 @@ command line options on one line, and do not type the "\" characters.
 The list of possible options which are specific to Gutenprint,
 followed by some of the supported choices, are shown below:
 
-   
       
    -o PageSize=<...| A3 | A4 | A4 | ...>
@@ -132,6 +144,9 @@ CLASS="PROGRAMLISTING"
    -o stpYellow=<0...4000>
    
    
    
 
 For more detailed information, consult the appropriate sections of the Home
+
 APPLICABILITY AND DEFINITIONS
    PrevPrevHomeUp
+VERBATIM COPYING
    
 
    HomeUp
+COPYING IN QUANTITY
    
 
    HomeUp
+MODIFICATIONS
    
 
    HomeUp
+COMBINING DOCUMENTS
    
 
    HomeUp
+COLLECTIONS OF DOCUMENTS
    
 
    HomeUp
+AGGREGATION WITH INDEPENDENT WORKS
    
 
    HomeUp
+TRANSLATION
    
 
    HomeUp
+TERMINATION
    
 
    HomeUp
+FUTURE REVISIONS OF THIS LICENSE
    
 
    HomeUp
+How to use this License for your documents
    
 
    HomeUp
+The Gimp-Print Graphical User Interface
    
 
    Prev2.2. The Gimp-Print Graphical User InterfaceThe Gimp-Print Graphical User Interface
       Now that the GIMP is displaying your picture, put your mouse over
@@ -206,7 +203,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 >2.2.1. Printer SettingsPrinter Settings
    2.2.1.1. PrinterPrinter
          Click on the 2.2.1.2. Setup PrinterSetup Printer
         Before any useful printing can occur, the user needs to associate
@@ -335,7 +332,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.1.3. New PrinterNew Printer
         In the previous sections, the user selected an existing printer
@@ -408,7 +405,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.1.4. Media SizeMedia Size
         The term 2.2.1.5. Media TypeMedia Type
         The type of media onto which your image will be printed should be
@@ -489,7 +486,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.1.6. Media SourceMedia Source
         The 2.2.1.7. Ink TypeInk Type
       Some printers offer a choice of different types of ink or ink
@@ -537,7 +534,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.1.8. ResolutionResolution
         Click on the arrow to the right of the
@@ -559,7 +556,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.1.8.1. DPIDPI
             DPI is an acronym which stands for 2.2.1.8.2. Draft or Fast Economy DraftDraft or Fast Economy Draft
         When this text appears next to the resolution, it refers to the
@@ -620,7 +617,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.1.8.3. UnidirectionalUnidirectional
             When printing an image, you have probably noticed the print
@@ -645,7 +642,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.1.8.4. High(est) QualityHigh(est) Quality
             With lower quality print modes, one may see an effect where
@@ -677,7 +674,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.1.8.5. DMTDMT
           DMT is an acronym which stands for 2.2.2. PreviewPreview
       Notice in the upper left of the window is a preview of your image.
@@ -828,7 +825,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 >2.2.3. PositionPosition
    2.2.3.1. OrientationOrientation
          The Orientation menu allows the user to choose the orientation
@@ -903,7 +900,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.3.2. Automatic CenteringAutomatic Centering
          There are three buttons that deal with centering an image.  The
@@ -949,7 +946,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.3.3. Manual SettingsManual Settings
          You will notice that there are six boxes that contain numbers
@@ -964,7 +961,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.3.3.1. LeftLeft
         The number appearing in the 2.2.3.3.2. RightRight
         The number appearing in the 2.2.3.3.3. Right BorderRight Border
         The number appearing in the 2.2.3.3.4. TopTop
         The number appearing in the 2.2.3.3.5. BottomBottom
         The number appearing in the 2.2.3.3.6. Bottom BorderBottom Border
         The number appearing in the 2.2.4. SizeSize
    2.2.4.1. Slider Bar and Spin BoxSlider Bar and Spin Box
          The slider bar can be moved as desired by the user.  Notice
@@ -1173,7 +1170,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.4.2. Scale by Percent or PPIScale by Percent or PPI
           One may choose to scale the image by a percentage, or by PPI,
@@ -1223,7 +1220,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.4.3. Use Original Image SizeUse Original Image Size
           By clicking this button, the image will be scaled to as close
@@ -1254,7 +1251,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.4.4. Width and HeightWidth and Height
           These boxes show the size of the printed image in either inches
@@ -1271,7 +1268,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.4.5. UnitsUnits
          The units can be set to inches or centimeters by clicking the appropriate
@@ -1287,7 +1284,7 @@ CLASS="SECT2"
 CLASS="SECT2"
 >2.2.5. Image/Output SettingsImage/Output Settings
       By clicking on the tab labeled 2.2.5.1. Image TypeImage Type
    2.2.5.1.1. Line ArtLine Art
          This setting tells the printer driver to generate color
@@ -1340,7 +1337,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.5.1.2. Solid ColorsSolid Colors
          This mode produces color which is considerably more accurate
@@ -1359,7 +1356,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.5.1.3. PhotographPhotograph
          This mode produces the most accurate colors and tonalities at a
@@ -1374,7 +1371,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.5.2. Output TypeOutput Type
          The user is given the choice of color, black and white, and
@@ -1390,7 +1387,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 >2.2.5.3. Adjust OutputAdjust Output
          Clicking on this button causes the 2.2.5.3.1. BrightnessBrightness
        Adjust the brightness of the image.  A setting of 0.0 gives a fully black
@@ -1445,7 +1442,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.5.3.2. ContrastContrast
        Adjust the contrast of the image.  A setting of 0.0 gives a solid gray for the
@@ -1458,7 +1455,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.5.3.3. Cyan, Magenta, YellowCyan, Magenta, Yellow
    These three options allow specification of the cyan, magenta, and
@@ -1473,7 +1470,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.5.3.4. SaturationSaturation
    Adjust the brilliance of colors.  A setting of 0.0 results in pure grayscale.
@@ -1490,7 +1487,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.5.3.5. DensityDensity
    Adjust the amount of ink deposited on the paper.  If you have chosen the
@@ -1515,7 +1512,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.5.3.6. GammaGamma
    Adjust the gamma of the image, over and above the printer-specific
@@ -1531,7 +1528,7 @@ CLASS="SECT4"
 CLASS="SECT4"
 >2.2.5.3.7. Dither AlgorithmDither Algorithm
    The recommended dither algorithm is 2.2.5.3.8. Set Defaults and CloseSet Defaults and Close
          When the 2.2.6. Printing and Saving SettingsPrinting and Saving Settings
        At the bottom of the Gimp-Print window, there are five buttons labeled
@@ -1714,7 +1711,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 >PrevHomeUp\n"
 "Language-Team: Czech \n"
@@ -474,58 +474,51 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Hustota:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
-msgid "Adjust the cyan balance"
+msgid "Adjust the cyan density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Fialová"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
-msgid "Adjust the magenta balance"
+msgid "Adjust the magenta density"
 msgstr "Upravit vyrovnání fialové tisku"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Žlutá"
+msgid "Yellow Density"
+msgstr "Hustota:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
-msgid "Adjust the yellow balance"
+msgid "Adjust the yellow density"
 msgstr "Upravit vyrovnání žluté tisku"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "Černobíle"
+msgid "Black Density"
+msgstr "Hustota:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
-msgid "Adjust the black balance"
+msgid "Adjust the black density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -597,14 +590,14 @@ msgstr "Fotografické barvy CcMmY"
 msgid "Photo CcMmYK Color"
 msgstr "Fotografické barvy CcMmYK"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Barva"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -672,7 +665,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Zrušit"
@@ -701,7 +694,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -871,12 +864,47 @@ msgstr "Upravit vyrovnání žluté tisku"
 msgid "Adjust the black gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Odstíny šedi"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "Upravit vyrovnání modrozelené tisku"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Fialová"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "Upravit vyrovnání fialové tisku"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Žlutá"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "Upravit vyrovnání žluté tisku"
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Sytost:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -885,183 +913,183 @@ msgstr ""
 "Použijte nulovou sytost pro vytvoření výstupu ve stupních šedi pomocí "
 "barevných a Äerných inkoustů"
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Typ inkoustu"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 msgid "Advanced Output Control"
 msgstr ""
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Černá"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Zrušit"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Fialová"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Fialová"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Černá"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Černá"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Fialová"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Fialová"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Černá"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Černá"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Sytost:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1155,8 +1183,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1443,8 +1471,9 @@ msgid "Adjust the yellow map"
 msgstr "Upravit vyrovnání žluté tisku"
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Černobíle"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
@@ -1462,22 +1491,22 @@ msgstr "Upravit vyrovnání žluté tisku"
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Žlutá"
+msgid "Red Density"
+msgstr "Hustota:"
 
 #: src/main/print-escp2.c:445
 #, fuzzy
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr "Upravit vyrovnání žluté tisku"
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Černobíle"
+msgid "Blue Density"
+msgstr "Hustota:"
 
 #: src/main/print-escp2.c:453
 #, fuzzy
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
 #: src/main/print-escp2.c:460
@@ -1551,48 +1580,48 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Tisknout do souboru?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "RuÄní"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Tiskárna nepodporuje barevný výstup\n"
@@ -1768,6 +1797,31 @@ msgstr "Matný papír"
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+#, fuzzy
+msgid "Adjust the cyan balance"
+msgstr "Upravit vyrovnání modrozelené tisku"
+
+#: src/main/print-olympus.c:1230
+#, fuzzy
+msgid "Adjust the magenta balance"
+msgstr "Upravit vyrovnání fialové tisku"
+
+#: src/main/print-olympus.c:1238
+#, fuzzy
+msgid "Adjust the yellow balance"
+msgstr "Upravit vyrovnání žluté tisku"
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "Černobíle"
+
+#: src/main/print-olympus.c:1246
+#, fuzzy
+msgid "Adjust the black balance"
+msgstr "Upravit vyrovnání modrozelené tisku"
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Normální"
@@ -5665,6 +5719,10 @@ msgstr "Å patné parametry; nemohu pokraÄovat!\n"
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Získání dalšího řádku selhalo na %.0f\n"
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Žlutá"
+
 #~ msgid "Printer status requires using a raw device.\n"
 #~ msgstr "Stav tiskárny vyžaduje použití přímého zařízení.\n"
 
diff --git a/po/da.gmo b/po/da.gmo
index 4550cf0..8a46135 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index b2f9f7d..580c6a1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2001-10-19 20:53+0200\n"
 "Last-Translator: Keld Simonsen \n"
 "Language-Team: Danish \n"
@@ -440,53 +440,47 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Tæthed:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
-msgid "Adjust the cyan balance"
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+msgid "Adjust the cyan density"
 msgstr ""
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Magenta:"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
-msgid "Adjust the magenta balance"
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+msgid "Adjust the magenta density"
 msgstr ""
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Gul:"
+msgid "Yellow Density"
+msgstr "Tæthed:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
-msgid "Adjust the yellow balance"
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+msgid "Adjust the yellow density"
 msgstr ""
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
-msgid "Black Balance"
-msgstr ""
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#, fuzzy
+msgid "Black Density"
+msgstr "Tæthed:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
-msgid "Adjust the black balance"
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+msgid "Adjust the black density"
 msgstr ""
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -557,14 +551,14 @@ msgstr ""
 msgid "Photo CcMmYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Farver"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
@@ -631,7 +625,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Annullér"
@@ -660,7 +654,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -822,195 +816,227 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Gråtoner"
+
+#: src/main/print-color.c:314
+msgid "Adjust the cyan gray balance"
+msgstr ""
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Magenta:"
+
+#: src/main/print-color.c:322
+msgid "Adjust the magenta gray balance"
+msgstr ""
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Gul:"
+
+#: src/main/print-color.c:330
+msgid "Adjust the yellow gray balance"
+msgstr ""
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Mætning:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Blæktype"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Udskriftstype:"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Udskriftstype:"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Annullér"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta:"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta:"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Gul:"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Gul:"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "Gul:"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "Gul:"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta:"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta:"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "Gul:"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "Gul:"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Mætning:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1101,8 +1127,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1378,8 +1404,9 @@ msgid "Adjust the yellow map"
 msgstr ""
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Gul:"
 
 #: src/main/print-escp2.c:351
 msgid "Adjust the blue map"
@@ -1395,20 +1422,20 @@ msgstr ""
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Gul:"
+msgid "Red Density"
+msgstr "Tæthed:"
 
 #: src/main/print-escp2.c:445
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr ""
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Gul:"
+msgid "Blue Density"
+msgstr "Tæthed:"
 
 #: src/main/print-escp2.c:453
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr ""
 
 #: src/main/print-escp2.c:460
@@ -1480,46 +1507,46 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Udskriv til fil?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Udskriftstype:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
@@ -1693,6 +1720,26 @@ msgstr ""
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+msgid "Adjust the cyan balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1230
+msgid "Adjust the magenta balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1238
+msgid "Adjust the yellow balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1245
+msgid "Black Balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1246
+msgid "Adjust the black balance"
+msgstr ""
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Udskriv"
@@ -5309,6 +5356,10 @@ msgstr ""
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Gul:"
+
 #, fuzzy
 #~ msgid "Gloss Balance"
 #~ msgstr "Gul:"
diff --git a/po/de.gmo b/po/de.gmo
index cbbde63..991fd91 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 531eb27..116b1f5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2002-09-05 21:20MET\n"
 "Last-Translator: Olaf Klemke \n"
 "Language-Team: deutsch \n"
@@ -481,58 +481,51 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Empfindlichkeit:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
-msgid "Adjust the cyan balance"
+msgid "Adjust the cyan density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Magenta"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
-msgid "Adjust the magenta balance"
+msgid "Adjust the magenta density"
 msgstr "Stellen sie die Magenta-Balance ein"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Stellen sie die Gelb-Balance ein"
+msgid "Yellow Density"
+msgstr "Empfindlichkeit:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
-msgid "Adjust the yellow balance"
+msgid "Adjust the yellow density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "Schwarz-Weiß"
+msgid "Black Density"
+msgstr "Empfindlichkeit:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
-msgid "Adjust the black balance"
+msgid "Adjust the black density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -604,14 +597,14 @@ msgstr "Foto CcMmY Farbe"
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK Farbe"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Farbe"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -679,7 +672,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Abbruch"
@@ -708,7 +701,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -878,12 +871,47 @@ msgstr "Stellen sie die Cyan-Balance ein"
 msgid "Adjust the black gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Graustufen"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "Stellen sie die Cyan-Balance ein"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Magenta"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "Stellen sie die Magenta-Balance ein"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Stellen sie die Gelb-Balance ein"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "Stellen sie die Gelb-Balance ein"
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Farbbalance:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -892,184 +920,184 @@ msgstr ""
 "Stellen sie den Wert auf Null um einen Graustufenausdruck mit farbiger und "
 "schwarzer Tinte zu erzeugen. "
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Tintentype"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Schwarz"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Ausgabeart:"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Abbruch"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Schwarz"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Schwarz"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Schwarz"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Schwarz"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Farbbalance:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1163,8 +1191,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1452,8 +1480,9 @@ msgid "Adjust the yellow map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Schwarz-Weiß"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
@@ -1471,22 +1500,22 @@ msgstr "Stellen sie die Gelb-Balance ein"
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Stellen sie die Gelb-Balance ein"
+msgid "Red Density"
+msgstr "Empfindlichkeit:"
 
 #: src/main/print-escp2.c:445
 #, fuzzy
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Schwarz-Weiß"
+msgid "Blue Density"
+msgstr "Empfindlichkeit:"
 
 #: src/main/print-escp2.c:453
 #, fuzzy
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
 #: src/main/print-escp2.c:460
@@ -1561,48 +1590,48 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Drucke in Datei?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Größe"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Drucker unterstützt keine Rohdatenausgabe\n"
@@ -1778,6 +1807,31 @@ msgstr "Mattes Papier"
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+#, fuzzy
+msgid "Adjust the cyan balance"
+msgstr "Stellen sie die Cyan-Balance ein"
+
+#: src/main/print-olympus.c:1230
+#, fuzzy
+msgid "Adjust the magenta balance"
+msgstr "Stellen sie die Magenta-Balance ein"
+
+#: src/main/print-olympus.c:1238
+#, fuzzy
+msgid "Adjust the yellow balance"
+msgstr "Stellen sie die Gelb-Balance ein"
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "Schwarz-Weiß"
+
+#: src/main/print-olympus.c:1246
+#, fuzzy
+msgid "Adjust the black balance"
+msgstr "Stellen sie die Cyan-Balance ein"
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Einfach"
@@ -5560,6 +5614,10 @@ msgstr "Unzul
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Zeilensprung gescheitert bei % 0f \n"
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Stellen sie die Gelb-Balance ein"
+
 #~ msgid "Printer status requires using a raw device.\n"
 #~ msgstr ""
 #~ "Zur Druckerabfrage  bedarf es des Zugriffs auf die direkte "
diff --git a/po/el.gmo b/po/el.gmo
index 6731948..ca622e3 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index 561c296..9fcd10e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2001-12-29 20:10+0000\n"
 "Last-Translator: Simos Xenitellis \n"
 "Language-Team: Greek \n"
@@ -486,58 +486,51 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Ðõêíüôçôá"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
-msgid "Adjust the cyan balance"
+msgid "Adjust the cyan density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "ìþâ"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
-msgid "Adjust the magenta balance"
+msgid "Adjust the magenta density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgid "Yellow Density"
+msgstr "Ðõêíüôçôá"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
-msgid "Adjust the yellow balance"
+msgid "Adjust the yellow density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "Ìáõ_ñüáóðñï"
+msgid "Black Density"
+msgstr "Ðõêíüôçôá"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
-msgid "Adjust the black balance"
+msgid "Adjust the black density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -616,14 +609,14 @@ msgid "Photo CcMmYK Color"
 msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò"
 
 #
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "×ñþìá"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -693,7 +686,7 @@ msgid "KCMY"
 msgstr ""
 
 #
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Áêýñùóç"
@@ -724,7 +717,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -892,198 +885,233 @@ msgstr "
 msgid "Adjust the black gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "ìþâ"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
 #
-#: src/main/print-color.c:313
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Êïñåóìüò:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Ôýðïò MIME"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Ìáýñï"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
 #
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Áêýñùóç"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "ìþâ"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "ìþâ"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Ìáýñï"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Ìáýñï"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "ìþâ"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "ìþâ"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Ìáýñï"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Ìáýñï"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
 #
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Êïñåóìüò:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1174,8 +1202,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1464,8 +1492,9 @@ msgid "Adjust the yellow map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Ìáõ_ñüáóðñï"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
@@ -1483,22 +1512,22 @@ msgstr "
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgid "Red Density"
+msgstr "Ðõêíüôçôá"
 
 #: src/main/print-escp2.c:445
 #, fuzzy
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Ìáõ_ñüáóðñï"
+msgid "Blue Density"
+msgstr "Ðõêíüôçôá"
 
 #: src/main/print-escp2.c:453
 #, fuzzy
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-escp2.c:460
@@ -1572,49 +1601,49 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Byte Åîüäïõ"
 
 #
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 #, fuzzy
 msgid "Bidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
@@ -1793,6 +1822,31 @@ msgstr "
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+#, fuzzy
+msgid "Adjust the cyan balance"
+msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
+#: src/main/print-olympus.c:1230
+#, fuzzy
+msgid "Adjust the magenta balance"
+msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
+#: src/main/print-olympus.c:1238
+#, fuzzy
+msgid "Adjust the yellow balance"
+msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "Ìáõ_ñüáóðñï"
+
+#: src/main/print-olympus.c:1246
+#, fuzzy
+msgid "Adjust the black balance"
+msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
 #: src/main/print-pcl.c:182
 #, fuzzy
 msgid "Plain"
@@ -5575,6 +5629,10 @@ msgstr ""
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
 #, fuzzy
 #~ msgid "Gloss Balance"
 #~ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index c993f3a..c72e3ea 100644
Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ
diff --git a/po/en_GB.po b/po/en_GB.po
index ed35e8b..1dbff24 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2004-09-23 00:10+0100\n"
 "Last-Translator: Roger Leigh \n"
 "Language-Team: British English\n"
@@ -445,51 +445,51 @@ msgid "Printing Output Mode"
 msgstr "Printing Output Mode"
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr "Cyan Balance"
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Density"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
-msgid "Adjust the cyan balance"
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+#, fuzzy
+msgid "Adjust the cyan density"
 msgstr "Adjust the cyan balance"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
-msgid "Magenta Balance"
-msgstr "Magenta Balance"
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+#, fuzzy
+msgid "Magenta Density"
+msgstr "Magenta Curve"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
-msgid "Adjust the magenta balance"
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+#, fuzzy
+msgid "Adjust the magenta density"
 msgstr "Adjust the magenta balance"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
-msgid "Yellow Balance"
-msgstr "Yellow Balance"
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+#, fuzzy
+msgid "Yellow Density"
+msgstr "Density"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
-msgid "Adjust the yellow balance"
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+#, fuzzy
+msgid "Adjust the yellow density"
 msgstr "Adjust the yellow balance"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
-msgid "Black Balance"
-msgstr "Black Balance"
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#, fuzzy
+msgid "Black Density"
+msgstr "Density"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
-msgid "Adjust the black balance"
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+#, fuzzy
+msgid "Adjust the black density"
 msgstr "Adjust the black balance"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -558,14 +558,14 @@ msgstr "Photo CcMmY Colour"
 msgid "Photo CcMmYK Color"
 msgstr "Photo CcMmYK Colour"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Colour"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
@@ -630,7 +630,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 msgid "Channel "
 msgstr "Channel "
 
@@ -656,7 +656,7 @@ msgid "Color Correction"
 msgstr "Colour Correction"
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr "Basic Image Adjustment"
@@ -808,11 +808,44 @@ msgstr "Adjust the blue gamma"
 msgid "Adjust the black gamma"
 msgstr "Adjust the black gamma"
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr "Cyan Balance"
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Grayscale"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "Adjust the cyan balance"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+msgid "Magenta Balance"
+msgstr "Magenta Balance"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "Adjust the magenta balance"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+msgid "Yellow Balance"
+msgstr "Yellow Balance"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "Adjust the yellow balance"
+
+#: src/main/print-color.c:337
 msgid "Saturation"
 msgstr "Saturation"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -820,164 +853,164 @@ msgstr ""
 "Adjust the saturation (colour balance) of the print\n"
 "Use zero saturation to produce grayscale output using colour and black inks"
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 msgid "Ink Limit"
 msgstr "Ink Limit"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 msgid "Advanced Output Control"
 msgstr "Advanced Output Control"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr "Limit the total ink printed to the page"
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr "GCR Transition"
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr "Adjust the gray component transition rate"
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr "GCR Lower Bound"
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr "Lower bound of gray component reduction"
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr "GCR Upper Bound"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr "Upper bound of gray component reduction"
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 msgid " Curve"
 msgstr " Curve"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 msgid "Output Curves"
 msgstr "Output Curves"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr "Curve for raw channel "
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr "Cyan Curve"
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 msgid "Cyan curve"
 msgstr "Cyan curve"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 msgid "Magenta Curve"
 msgstr "Magenta Curve"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 msgid "Magenta curve"
 msgstr "Magenta curve"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 msgid "Yellow Curve"
 msgstr "Yellow Curve"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 msgid "Yellow curve"
 msgstr "Yellow curve"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 msgid "Black Curve"
 msgstr "Black Curve"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 msgid "Black curve"
 msgstr "Black curve"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 msgid "Red Curve"
 msgstr "Red Curve"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 msgid "Red curve"
 msgstr "Red curve"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 msgid "Green Curve"
 msgstr "Green Curve"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 msgid "Green curve"
 msgstr "Green curve"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 msgid "Blue Curve"
 msgstr "Blue Curve"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 msgid "Blue curve"
 msgstr "Blue curve"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 msgid "White Curve"
 msgstr "White Curve"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 msgid "White curve"
 msgstr "White curve"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr "Hue Map"
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr "Advanced HSL Curves"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr "Hue adjustment curve"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 msgid "Saturation Map"
 msgstr "Saturation Map"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr "Saturation adjustment curve"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr "Luminosity Map"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr "Luminosity adjustment curve"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr "Gray Component Reduction"
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr "Gray component reduction curve"
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditional Gutenprint colour conversion"
 
@@ -1072,8 +1105,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1367,19 +1400,23 @@ msgid "Adjust the red map"
 msgstr "Adjust the red gamma"
 
 #: src/main/print-escp2.c:444
-msgid "Red Balance"
-msgstr "Red Balance"
+#, fuzzy
+msgid "Red Density"
+msgstr "Density"
 
 #: src/main/print-escp2.c:445
-msgid "Adjust the red balance"
+#, fuzzy
+msgid "Adjust the red density"
 msgstr "Adjust the red balance"
 
 #: src/main/print-escp2.c:452
-msgid "Blue Balance"
-msgstr "Blue Balance"
+#, fuzzy
+msgid "Blue Density"
+msgstr "Density"
 
 #: src/main/print-escp2.c:453
-msgid "Adjust the blue balance"
+#, fuzzy
+msgid "Adjust the blue density"
 msgstr "Adjust the blue balance"
 
 #: src/main/print-escp2.c:460
@@ -1448,44 +1485,44 @@ msgstr "Normal"
 msgid "Print To Hub"
 msgstr "Print To Hub"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manual Control"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 msgid "Bidirectional"
 msgstr "Bidirectional"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 msgid "Unidirectional"
 msgstr "Unidirectional"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr "Alternate Fill"
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr "Ascending Fill"
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr "Descending Fill"
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr "Ascending Double"
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr "Nearest Neighbour Avoidance"
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "This printer does not support raw printer output at depth %d\n"
@@ -1662,6 +1699,26 @@ msgstr "Matte Paper"
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+msgid "Adjust the cyan balance"
+msgstr "Adjust the cyan balance"
+
+#: src/main/print-olympus.c:1230
+msgid "Adjust the magenta balance"
+msgstr "Adjust the magenta balance"
+
+#: src/main/print-olympus.c:1238
+msgid "Adjust the yellow balance"
+msgstr "Adjust the yellow balance"
+
+#: src/main/print-olympus.c:1245
+msgid "Black Balance"
+msgstr "Black Balance"
+
+#: src/main/print-olympus.c:1246
+msgid "Adjust the black balance"
+msgstr "Adjust the black balance"
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Plain"
@@ -5407,6 +5464,12 @@ msgstr "Bad parameters; cannot continue!\n"
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Get next row failed at %.0f\n"
 
+#~ msgid "Red Balance"
+#~ msgstr "Red Balance"
+
+#~ msgid "Blue Balance"
+#~ msgstr "Blue Balance"
+
 #~ msgid "Printer status requires using a raw device.\n"
 #~ msgstr "Printer status requires using a raw device.\n"
 
diff --git a/po/es.gmo b/po/es.gmo
index b6d9b3e..8dfb992 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 3bd7d35..4e13b26 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2002-04-29 00:38GMT\n"
 "Last-Translator: Gustavo D. Vranjes \n"
 "Language-Team: Castellano \n"
@@ -483,58 +483,51 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Densidad:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
-msgid "Adjust the cyan balance"
+msgid "Adjust the cyan density"
 msgstr "Ajustar el balance de cian de la impresión"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Magenta"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
-msgid "Adjust the magenta balance"
+msgid "Adjust the magenta density"
 msgstr "Ajusta el balance magenta de la impresión"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgid "Yellow Density"
+msgstr "Densidad:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
-msgid "Adjust the yellow balance"
+msgid "Adjust the yellow density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "Blanco y Negro"
+msgid "Black Density"
+msgstr "Densidad:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
-msgid "Adjust the black balance"
+msgid "Adjust the black density"
 msgstr "Ajustar el balance de cian de la impresión"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -606,14 +599,14 @@ msgstr "Color CcMmY para Fotograf
 msgid "Photo CcMmYK Color"
 msgstr "Color CcMmYK para Fotografía"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Color"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -681,7 +674,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Cancelar"
@@ -710,7 +703,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -881,12 +874,47 @@ msgstr "Ajustar el balance de cian de la impresi
 msgid "Adjust the black gamma"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Tonos de gris"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "Ajustar el balance de cian de la impresión"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Magenta"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "Ajusta el balance magenta de la impresión"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Ajusta el balance amarillo de la impresión"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "Ajusta el balance amarillo de la impresión"
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Saturación:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -895,184 +923,184 @@ msgstr ""
 "Usar saturación cero para producir salida de tonos de grises usando tintas "
 "color y negro."
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Tipo de Tinta"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Negro"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Tipo de salida:"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Cancelar"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Negro"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Negro"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Negro"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Negro"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Saturación:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1166,8 +1194,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1455,8 +1483,9 @@ msgid "Adjust the yellow map"
 msgstr "Ajusta el balance amarillo de la impresión"
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Blanco y Negro"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
@@ -1474,22 +1503,22 @@ msgstr "Ajusta el balance amarillo de la impresi
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgid "Red Density"
+msgstr "Densidad:"
 
 #: src/main/print-escp2.c:445
 #, fuzzy
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Blanco y Negro"
+msgid "Blue Density"
+msgstr "Densidad:"
 
 #: src/main/print-escp2.c:453
 #, fuzzy
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr "Ajustar el balance de cian de la impresión"
 
 #: src/main/print-escp2.c:460
@@ -1564,48 +1593,48 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamaño"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "La impresora no soporta salida de color\n"
@@ -1781,6 +1810,31 @@ msgstr "Papel Opaco"
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+#, fuzzy
+msgid "Adjust the cyan balance"
+msgstr "Ajustar el balance de cian de la impresión"
+
+#: src/main/print-olympus.c:1230
+#, fuzzy
+msgid "Adjust the magenta balance"
+msgstr "Ajusta el balance magenta de la impresión"
+
+#: src/main/print-olympus.c:1238
+#, fuzzy
+msgid "Adjust the yellow balance"
+msgstr "Ajusta el balance amarillo de la impresión"
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "Blanco y Negro"
+
+#: src/main/print-olympus.c:1246
+#, fuzzy
+msgid "Adjust the black balance"
+msgstr "Ajustar el balance de cian de la impresión"
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Común"
@@ -5740,6 +5794,10 @@ msgstr "
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Traer próxima fila falló en %d\n"
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Ajusta el balance amarillo de la impresión"
+
 #~ msgid "Printer status requires using a raw device.\n"
 #~ msgstr ""
 #~ "El estado de la impresora requiere el uso de un dispositivo crudo.\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index 7e55ed3..7b62817 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 3a70869..9b56281 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 4.2.1-pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2002-09-15 16:07+0200\n"
 "Last-Translator: Raymond Ostertag \n"
 "Language-Team: GNOME French Team \n"
@@ -483,58 +483,51 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Densité :"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
-msgid "Adjust the cyan balance"
+msgid "Adjust the cyan density"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Magenta"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
-msgid "Adjust the magenta balance"
+msgid "Adjust the magenta density"
 msgstr "Ajuste le niveau de majenta de l'impression"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgid "Yellow Density"
+msgstr "Densité :"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
-msgid "Adjust the yellow balance"
+msgid "Adjust the yellow density"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "Noir et blanc"
+msgid "Black Density"
+msgstr "Densité :"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
-msgid "Adjust the black balance"
+msgid "Adjust the black density"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -606,14 +599,14 @@ msgstr "Photo couleur CcMmJ"
 msgid "Photo CcMmYK Color"
 msgstr "Photo couleur CcMmJN"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Couleur"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -681,7 +674,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Annuler"
@@ -710,7 +703,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -881,12 +874,47 @@ msgstr "Ajuste le niveau de cyan de l'impression"
 msgid "Adjust the black gamma"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Niveaux de gris"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "Ajuste le niveau de cyan de l'impression"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Magenta"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "Ajuste le niveau de majenta de l'impression"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Ajuste le niveau de jaune de l'impression"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "Ajuste le niveau de jaune de l'impression"
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Saturation :"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -895,184 +923,184 @@ msgstr ""
 "Utilisez la saturation zéro pour produire une sortie en tons de gris avec "
 "les encres noir et couleurs."
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Type d'encre"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Type de sortie :"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Noir"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Type de sortie :"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Annuler"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Noir"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Noir"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Noir"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Noir"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Saturation :"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1166,8 +1194,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1455,8 +1483,9 @@ msgid "Adjust the yellow map"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Noir et blanc"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
@@ -1474,22 +1503,22 @@ msgstr "Ajuste le niveau de jaune de l'impression"
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Ajuste le niveau de jaune de l'impression"
+msgid "Red Density"
+msgstr "Densité :"
 
 #: src/main/print-escp2.c:445
 #, fuzzy
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Noir et blanc"
+msgid "Blue Density"
+msgstr "Densité :"
 
 #: src/main/print-escp2.c:453
 #, fuzzy
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
 #: src/main/print-escp2.c:460
@@ -1564,48 +1593,48 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Imprimer dans un fichier ?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Type de sortie :"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Taille"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 ppp Unirectionnel"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 ppp Unirectionnel"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "L'imprimante ne supporte pas les sorties en couleur\n"
@@ -1781,6 +1810,31 @@ msgstr "Papier Mat"
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+#, fuzzy
+msgid "Adjust the cyan balance"
+msgstr "Ajuste le niveau de cyan de l'impression"
+
+#: src/main/print-olympus.c:1230
+#, fuzzy
+msgid "Adjust the magenta balance"
+msgstr "Ajuste le niveau de majenta de l'impression"
+
+#: src/main/print-olympus.c:1238
+#, fuzzy
+msgid "Adjust the yellow balance"
+msgstr "Ajuste le niveau de jaune de l'impression"
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "Noir et blanc"
+
+#: src/main/print-olympus.c:1246
+#, fuzzy
+msgid "Adjust the black balance"
+msgstr "Ajuste le niveau de cyan de l'impression"
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Normal"
@@ -5739,6 +5793,10 @@ msgstr "Mauvais param
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Obtenir la ligne suivante à échoué à %.0f\n"
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Ajuste le niveau de jaune de l'impression"
+
 #~ msgid "Printer status requires using a raw device.\n"
 #~ msgstr ""
 #~ "Le status de l'imprimante demande d'utiliser un périphérique d'entrée\n"
diff --git a/po/gutenprint.pot b/po/gutenprint.pot
index bc76393..c020d1b 100644
--- a/po/gutenprint.pot
+++ b/po/gutenprint.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -434,51 +434,43 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+msgid "Cyan Density"
 msgstr ""
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
-msgid "Adjust the cyan balance"
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+msgid "Adjust the cyan density"
 msgstr ""
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
-msgid "Magenta Balance"
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
+msgid "Magenta Density"
 msgstr ""
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
-msgid "Adjust the magenta balance"
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+msgid "Adjust the magenta density"
 msgstr ""
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
-msgid "Yellow Balance"
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
+msgid "Yellow Density"
 msgstr ""
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
-msgid "Adjust the yellow balance"
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+msgid "Adjust the yellow density"
 msgstr ""
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
-msgid "Black Balance"
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+msgid "Black Density"
 msgstr ""
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
-msgid "Adjust the black balance"
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+msgid "Adjust the black density"
 msgstr ""
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -547,14 +539,14 @@ msgstr ""
 msgid "Photo CcMmYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr ""
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
@@ -618,7 +610,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 msgid "Channel "
 msgstr ""
 
@@ -644,7 +636,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -794,174 +786,203 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:313
-msgid "Saturation"
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+msgid "GrayBalance"
 msgstr ""
 
 #: src/main/print-color.c:314
+msgid "Adjust the cyan gray balance"
+msgstr ""
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+msgid "Magenta Balance"
+msgstr ""
+
+#: src/main/print-color.c:322
+msgid "Adjust the magenta gray balance"
+msgstr ""
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+msgid "Yellow Balance"
+msgstr ""
+
+#: src/main/print-color.c:330
+msgid "Adjust the yellow gray balance"
+msgstr ""
+
+#: src/main/print-color.c:337
+msgid "Saturation"
+msgstr ""
+
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 msgid "Ink Limit"
 msgstr ""
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 msgid "Advanced Output Control"
 msgstr ""
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 msgid " Curve"
 msgstr ""
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 msgid "Output Curves"
 msgstr ""
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 msgid "Cyan curve"
 msgstr ""
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 msgid "Magenta Curve"
 msgstr ""
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 msgid "Magenta curve"
 msgstr ""
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 msgid "Yellow Curve"
 msgstr ""
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 msgid "Yellow curve"
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 msgid "Black Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 msgid "Black curve"
 msgstr ""
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 msgid "Red Curve"
 msgstr ""
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 msgid "Red curve"
 msgstr ""
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 msgid "Green Curve"
 msgstr ""
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 msgid "Green curve"
 msgstr ""
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 msgid "Blue Curve"
 msgstr ""
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 msgid "Blue curve"
 msgstr ""
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 msgid "White Curve"
 msgstr ""
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 msgid "White curve"
 msgstr ""
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 msgid "Saturation Map"
 msgstr ""
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1052,8 +1073,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1330,19 +1351,19 @@ msgid "Adjust the red map"
 msgstr ""
 
 #: src/main/print-escp2.c:444
-msgid "Red Balance"
+msgid "Red Density"
 msgstr ""
 
 #: src/main/print-escp2.c:445
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr ""
 
 #: src/main/print-escp2.c:452
-msgid "Blue Balance"
+msgid "Blue Density"
 msgstr ""
 
 #: src/main/print-escp2.c:453
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr ""
 
 #: src/main/print-escp2.c:460
@@ -1409,44 +1430,44 @@ msgstr ""
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 msgid "Automatic"
 msgstr ""
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
@@ -1620,6 +1641,26 @@ msgstr ""
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+msgid "Adjust the cyan balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1230
+msgid "Adjust the magenta balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1238
+msgid "Adjust the yellow balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1245
+msgid "Black Balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1246
+msgid "Adjust the black balance"
+msgstr ""
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr ""
diff --git a/po/ja.gmo b/po/ja.gmo
index bc3dcfd..708aaa7 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 73ec996..65c682e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print Version 4.2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2002-10-07 19:10+0900\n"
 "Last-Translator: Takeshi AIHANA \n"
 "Language-Team: Japanese \n"
@@ -481,58 +481,51 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Ç»ÅÙ:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
-msgid "Adjust the cyan balance"
+msgid "Adjust the cyan density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
-msgid "Adjust the magenta balance"
+msgid "Adjust the magenta density"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgid "Yellow Density"
+msgstr "Ç»ÅÙ:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
-msgid "Adjust the yellow balance"
+msgid "Adjust the yellow density"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "¹õ¤ÈÇò"
+msgid "Black Density"
+msgstr "Ç»ÅÙ:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
-msgid "Adjust the black balance"
+msgid "Adjust the black density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -604,14 +597,14 @@ msgstr "
 msgid "Photo CcMmYK Color"
 msgstr "¥Õ¥©¥È CcMmYK ¿§"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "¥«¥é¡¼"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -679,7 +672,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "¼è¤ê¾Ã¤·"
@@ -708,7 +701,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -878,12 +871,47 @@ msgstr "
 msgid "Adjust the black gamma"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "¥Þ¥¼¥ó¥¿ (M)"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "ºÌÅÙ:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -891,184 +919,184 @@ msgstr ""
 "°õºþ»þ¤ÎºÌÅÙ (¥«¥é¡¼¡¦¥Ð¥é¥ó¥¹) ¤òÄ´À°¤·¤Þ¤¹¡£\n"
 "¥«¥é¡¼¤È¹õ¤ÎξÊý¤Î¥¤¥ó¥¯¤ò»È¤Ã¤Æ¥°¥ì¡¼¥¹¥±¡¼¥ë½ÐÎϤ¹¤ë¾ì¹ç¤Ï 0 ¤Ë¤·¤Æ²¼¤µ¤¤¡£"
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "¹õ¿§"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "¼è¤ê¾Ã¤·"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "¹õ¿§"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "¹õ¿§"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "¹õ¿§"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "¹õ¿§"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "ºÌÅÙ:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1162,8 +1190,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1451,8 +1479,9 @@ msgid "Adjust the yellow map"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "¹õ¤ÈÇò"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
@@ -1470,22 +1499,22 @@ msgstr "
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgid "Red Density"
+msgstr "Ç»ÅÙ:"
 
 #: src/main/print-escp2.c:445
 #, fuzzy
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "¹õ¤ÈÇò"
+msgid "Blue Density"
+msgstr "Ç»ÅÙ:"
 
 #: src/main/print-escp2.c:453
 #, fuzzy
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-escp2.c:460
@@ -1560,48 +1589,48 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
@@ -1777,6 +1806,31 @@ msgstr "
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+#, fuzzy
+msgid "Adjust the cyan balance"
+msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#: src/main/print-olympus.c:1230
+#, fuzzy
+msgid "Adjust the magenta balance"
+msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#: src/main/print-olympus.c:1238
+#, fuzzy
+msgid "Adjust the yellow balance"
+msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "¹õ¤ÈÇò"
+
+#: src/main/print-olympus.c:1246
+#, fuzzy
+msgid "Adjust the black balance"
+msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Ä̾ï"
@@ -5676,6 +5730,10 @@ msgstr "
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
 #~ msgid "Printer status requires using a raw device.\n"
 #~ msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¤Î¾õÂÖ¤¬É¬ÍפǤ¹¡£\n"
 
diff --git a/po/nb.gmo b/po/nb.gmo
index f4b87b7..35f443e 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index f0eff24..71652c2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2002-07-01 19:36+0200\n"
 "Last-Translator: Kjartan Maraas \n"
 "Language-Team: Norwegian/Bokmaal \n"
@@ -466,54 +466,47 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Tetthet:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
-msgid "Adjust the cyan balance"
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+msgid "Adjust the cyan density"
 msgstr ""
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Magenta"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
-msgid "Adjust the magenta balance"
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+msgid "Adjust the magenta density"
 msgstr ""
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Gul"
+msgid "Yellow Density"
+msgstr "Tetthet:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
-msgid "Adjust the yellow balance"
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+msgid "Adjust the yellow density"
 msgstr ""
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "Sort-hvitt"
+msgid "Black Density"
+msgstr "Tetthet:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
-msgid "Adjust the black balance"
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+msgid "Adjust the black density"
 msgstr ""
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -585,14 +578,14 @@ msgstr "Foto CcMmY-farge"
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK-farge"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Farger"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -660,7 +653,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Avbryt"
@@ -689,7 +682,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -848,195 +841,227 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Gråtoner"
+
+#: src/main/print-color.c:314
+msgid "Adjust the cyan gray balance"
+msgstr ""
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Magenta"
+
+#: src/main/print-color.c:322
+msgid "Adjust the magenta gray balance"
+msgstr ""
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Gul"
+
+#: src/main/print-color.c:330
+msgid "Adjust the yellow gray balance"
+msgstr ""
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Metning:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Blekktype"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Utskriftstype:"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Avbryt"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Metning:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1130,8 +1155,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1415,8 +1440,9 @@ msgid "Adjust the yellow map"
 msgstr ""
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Sort-hvitt"
 
 #: src/main/print-escp2.c:351
 msgid "Adjust the blue map"
@@ -1432,20 +1458,20 @@ msgstr ""
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Gul"
+msgid "Red Density"
+msgstr "Tetthet:"
 
 #: src/main/print-escp2.c:445
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr ""
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Sort-hvitt"
+msgid "Blue Density"
+msgstr "Tetthet:"
 
 #: src/main/print-escp2.c:453
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr ""
 
 #: src/main/print-escp2.c:460
@@ -1519,46 +1545,46 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Skriv ut til fil?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Skriver støtter ikke fargeutskrift\n"
@@ -1734,6 +1760,27 @@ msgstr "Matt papir"
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+msgid "Adjust the cyan balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1230
+msgid "Adjust the magenta balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1238
+msgid "Adjust the yellow balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "Sort-hvitt"
+
+#: src/main/print-olympus.c:1246
+msgid "Adjust the black balance"
+msgstr ""
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Skriv ut"
@@ -5405,6 +5452,10 @@ msgstr "Ugyldige parametere; kan ikke fortsette!\n"
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Henting av neste rad feilet ved %.0f\n"
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Gul"
+
 #~ msgid "Printer status requires using a raw device.\n"
 #~ msgstr "Skriverstatus krever bruk av en rå enhet.\n"
 
diff --git a/po/nl.gmo b/po/nl.gmo
index 0858499..25d4c65 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 0ce43c1..dc66510 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gimp-print 4.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2002-03-15 20:31+0100\n"
 "Last-Translator: Hylke Witjens \n"
 "Language-Team: Dutch \n"
@@ -471,58 +471,51 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Densiteit:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
-msgid "Adjust the cyan balance"
+msgid "Adjust the cyan density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Magenta"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
-msgid "Adjust the magenta balance"
+msgid "Adjust the magenta density"
 msgstr "Pas de hoeveelheid magenta aan"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Pas de hoeveelheid geel aan"
+msgid "Yellow Density"
+msgstr "Densiteit:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
-msgid "Adjust the yellow balance"
+msgid "Adjust the yellow density"
 msgstr "Pas de hoeveelheid geel aan"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "Zwart en Wit"
+msgid "Black Density"
+msgstr "Densiteit:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
-msgid "Adjust the black balance"
+msgid "Adjust the black density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -594,14 +587,14 @@ msgstr "Foto CcMmY kleuren"
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK Kleuren"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Kleur"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -669,7 +662,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Annuleren"
@@ -698,7 +691,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -863,193 +856,228 @@ msgstr "Pas de hoeveelheid cyaan aan"
 msgid "Adjust the black gamma"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Grijswaarden"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "Pas de hoeveelheid cyaan aan"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Magenta"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "Pas de hoeveelheid magenta aan"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Pas de hoeveelheid geel aan"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "Pas de hoeveelheid geel aan"
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Gekleurdheid:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Inkt type"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 msgid "Advanced Output Control"
 msgstr ""
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Zwart"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 msgid "Output Curves"
 msgstr ""
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Annuleren"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Zwart"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Zwart"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Zwart"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Zwart"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Gekleurdheid:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1143,8 +1171,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1431,8 +1459,9 @@ msgid "Adjust the yellow map"
 msgstr "Pas de hoeveelheid geel aan"
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Zwart en Wit"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
@@ -1450,22 +1479,22 @@ msgstr "Pas de hoeveelheid geel aan"
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Pas de hoeveelheid geel aan"
+msgid "Red Density"
+msgstr "Densiteit:"
 
 #: src/main/print-escp2.c:445
 #, fuzzy
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr "Pas de hoeveelheid geel aan"
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Zwart en Wit"
+msgid "Blue Density"
+msgstr "Densiteit:"
 
 #: src/main/print-escp2.c:453
 #, fuzzy
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
 #: src/main/print-escp2.c:460
@@ -1539,48 +1568,48 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Afdrukken Naar Bestand"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Handmatig"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Grootte"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI unidirectioneel"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI unidirectioneel"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Printer ondersteund geen kleuren\n"
@@ -1756,6 +1785,31 @@ msgstr "Mat papier"
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+#, fuzzy
+msgid "Adjust the cyan balance"
+msgstr "Pas de hoeveelheid cyaan aan"
+
+#: src/main/print-olympus.c:1230
+#, fuzzy
+msgid "Adjust the magenta balance"
+msgstr "Pas de hoeveelheid magenta aan"
+
+#: src/main/print-olympus.c:1238
+#, fuzzy
+msgid "Adjust the yellow balance"
+msgstr "Pas de hoeveelheid geel aan"
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "Zwart en Wit"
+
+#: src/main/print-olympus.c:1246
+#, fuzzy
+msgid "Adjust the black balance"
+msgstr "Pas de hoeveelheid cyaan aan"
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Blank"
@@ -5562,6 +5616,10 @@ msgstr ""
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Zoek volgende rij faalde op %d\n"
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Pas de hoeveelheid geel aan"
+
 #, fuzzy
 #~ msgid "Gloss Balance"
 #~ msgstr "Pas de hoeveelheid geel aan"
diff --git a/po/pl.gmo b/po/pl.gmo
index 16b37df..e9f8e92 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index a560cfb..1cb2e25 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2001-10-18 11:53+0100\n"
 "Last-Translator: GNOME PL Team \n"
 "Language-Team: Polish \n"
@@ -472,53 +472,47 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Gêsto¶æ:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
-msgid "Adjust the cyan balance"
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
+msgid "Adjust the cyan density"
 msgstr ""
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Purpurowy"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
-msgid "Adjust the magenta balance"
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
+msgid "Adjust the magenta density"
 msgstr ""
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "¯ó³æ"
+msgid "Yellow Density"
+msgstr "Gêsto¶æ:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
-msgid "Adjust the yellow balance"
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
+msgid "Adjust the yellow density"
 msgstr ""
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
-msgid "Black Balance"
-msgstr ""
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
+#, fuzzy
+msgid "Black Density"
+msgstr "Gêsto¶æ:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
-msgid "Adjust the black balance"
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
+msgid "Adjust the black density"
 msgstr ""
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -587,14 +581,14 @@ msgstr ""
 msgid "Photo CcMmYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Kolor"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
@@ -661,7 +655,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Anuluj"
@@ -690,7 +684,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -849,195 +843,227 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-color.c:314
+msgid "Adjust the cyan gray balance"
+msgstr ""
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Purpurowy"
+
+#: src/main/print-color.c:322
+msgid "Adjust the magenta gray balance"
+msgstr ""
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "¯ó³æ"
+
+#: src/main/print-color.c:330
+msgid "Adjust the yellow gray balance"
+msgstr ""
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Nasycenie:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Typ tuszu:"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Czarny"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Anuluj"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Purpurowy"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Purpurowy"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Czarny"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Czarny"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Purpurowy"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Purpurowy"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Czarny"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Czarny"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Nasycenie:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1128,8 +1154,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1407,8 +1433,9 @@ msgid "Adjust the yellow map"
 msgstr ""
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "¯ó³æ"
 
 #: src/main/print-escp2.c:351
 msgid "Adjust the blue map"
@@ -1424,20 +1451,20 @@ msgstr ""
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "¯ó³æ"
+msgid "Red Density"
+msgstr "Gêsto¶æ:"
 
 #: src/main/print-escp2.c:445
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr ""
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "¯ó³æ"
+msgid "Blue Density"
+msgstr "Gêsto¶æ:"
 
 #: src/main/print-escp2.c:453
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr ""
 
 #: src/main/print-escp2.c:460
@@ -1506,47 +1533,47 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
@@ -1720,6 +1747,26 @@ msgstr ""
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+msgid "Adjust the cyan balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1230
+msgid "Adjust the magenta balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1238
+msgid "Adjust the yellow balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1245
+msgid "Black Balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1246
+msgid "Adjust the black balance"
+msgstr ""
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr ""
@@ -5363,6 +5410,10 @@ msgstr ""
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "¯ó³æ"
+
 #, fuzzy
 #~ msgid "Gloss Balance"
 #~ msgstr "¯ó³æ"
diff --git a/po/pt.gmo b/po/pt.gmo
index 394f5a9..d6de92b 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index d9cabd9..3197c5c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2002-10-16 19:24+0100\n"
 "Last-Translator: Filipe Maia \n"
 "Language-Team: Portuguese \n"
@@ -481,58 +481,51 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Densidade:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
-msgid "Adjust the cyan balance"
+msgid "Adjust the cyan density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Magenta"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
-msgid "Adjust the magenta balance"
+msgid "Adjust the magenta density"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgid "Yellow Density"
+msgstr "Densidade:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
-msgid "Adjust the yellow balance"
+msgid "Adjust the yellow density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "Preto e Branco"
+msgid "Black Density"
+msgstr "Densidade:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
-msgid "Adjust the black balance"
+msgid "Adjust the black density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -604,14 +597,14 @@ msgstr "Cor CcMmY de Fotografia"
 msgid "Photo CcMmYK Color"
 msgstr "Cor CcMmYK de Fotografia<"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Cor"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -679,7 +672,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Cancelar"
@@ -708,7 +701,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -879,12 +872,47 @@ msgstr "Ajustar o equil
 msgid "Adjust the black gamma"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Magenta"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "Ajustar o equilíbrio de magenta da impressão"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Saturação:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -893,184 +921,184 @@ msgstr ""
 "Use saturação zero para produzir output em escala de cinzento usando tintas "
 "de cor e pretas"
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Tipo de tinta"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Preto"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Tipo de Output:"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Cancelar"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Preto"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Preto"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Preto"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Preto"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Saturação:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1164,8 +1192,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1453,8 +1481,9 @@ msgid "Adjust the yellow map"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Preto e Branco"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
@@ -1472,22 +1501,22 @@ msgstr "Ajustar o equil
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgid "Red Density"
+msgstr "Densidade:"
 
 #: src/main/print-escp2.c:445
 #, fuzzy
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Preto e Branco"
+msgid "Blue Density"
+msgstr "Densidade:"
 
 #: src/main/print-escp2.c:453
 #, fuzzy
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
 #: src/main/print-escp2.c:460
@@ -1562,48 +1591,48 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "A impressora não suporta a cor de impressão\n"
@@ -1779,6 +1808,31 @@ msgstr "Papel Mate"
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+#, fuzzy
+msgid "Adjust the cyan balance"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
+
+#: src/main/print-olympus.c:1230
+#, fuzzy
+msgid "Adjust the magenta balance"
+msgstr "Ajustar o equilíbrio de magenta da impressão"
+
+#: src/main/print-olympus.c:1238
+#, fuzzy
+msgid "Adjust the yellow balance"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "Preto e Branco"
+
+#: src/main/print-olympus.c:1246
+#, fuzzy
+msgid "Adjust the black balance"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Simples"
@@ -5710,6 +5764,10 @@ msgstr "Par
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Obtenção da próxima linha falhou em %.0f\n"
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
+
 #~ msgid "Printer status requires using a raw device.\n"
 #~ msgstr "Status da impressora requere a utilização de um dipositivo.\n"
 
diff --git a/po/sk.gmo b/po/sk.gmo
index 3c1e5e7..0d1066b 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index 42dadfd..4c0e55e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GIMP Print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2002-05-20 18:08+0100\n"
 "Last-Translator: Zdenko Podobný \n"
 "Language-Team: Slovak \n"
@@ -484,58 +484,51 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Hustota:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
-msgid "Adjust the cyan balance"
+msgid "Adjust the cyan density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Purpurová"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
-msgid "Adjust the magenta balance"
+msgid "Adjust the magenta density"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgid "Yellow Density"
+msgstr "Hustota:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
-msgid "Adjust the yellow balance"
+msgid "Adjust the yellow density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "Èiernobielo"
+msgid "Black Density"
+msgstr "Hustota:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
-msgid "Adjust the black balance"
+msgid "Adjust the black density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -607,14 +600,14 @@ msgstr "Fotografick
 msgid "Photo CcMmYK Color"
 msgstr "Fotografická CcMmYK farba"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Farebne"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -682,7 +675,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Storno"
@@ -711,7 +704,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -881,12 +874,47 @@ msgstr "Prisp
 msgid "Adjust the black gamma"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Purpurová"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Sýtos»:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -895,184 +923,184 @@ msgstr ""
 "Pou¾ite nulu na vyprodukovanie výstupu v odtieòoch ¹edej s pou¾itím "
 "farebného a èierneho atramentu"
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Typ atramentu"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Èierna"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Storno"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Purpurová"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Purpurová"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Èierna"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Èierna"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Purpurová"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Purpurová"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Èierna"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Èierna"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Sýtos»:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1166,8 +1194,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1455,8 +1483,9 @@ msgid "Adjust the yellow map"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Èiernobielo"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
@@ -1474,22 +1503,22 @@ msgstr "Prisp
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgid "Red Density"
+msgstr "Hustota:"
 
 #: src/main/print-escp2.c:445
 #, fuzzy
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Èiernobielo"
+msgid "Blue Density"
+msgstr "Hustota:"
 
 #: src/main/print-escp2.c:453
 #, fuzzy
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
 #: src/main/print-escp2.c:460
@@ -1564,48 +1593,48 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Tlaèi» do súboru?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Veµkos»"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Tlaèiareò nepodporuje farebný výstup\n"
@@ -1781,6 +1810,31 @@ msgstr "Matn
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+#, fuzzy
+msgid "Adjust the cyan balance"
+msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+
+#: src/main/print-olympus.c:1230
+#, fuzzy
+msgid "Adjust the magenta balance"
+msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
+
+#: src/main/print-olympus.c:1238
+#, fuzzy
+msgid "Adjust the yellow balance"
+msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "Èiernobielo"
+
+#: src/main/print-olympus.c:1246
+#, fuzzy
+msgid "Adjust the black balance"
+msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Jednoduchá"
@@ -5705,6 +5759,10 @@ msgstr "Zl
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+
 #~ msgid "Printer status requires using a raw device.\n"
 #~ msgstr "Stav tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 4181a05..47c75ae 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index c81b86c..37c71e9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 09:44+0100\n"
+"POT-Creation-Date: 2005-07-15 19:53-0400\n"
 "PO-Revision-Date: 2002-10-03 13:47+0200\n"
 "Last-Translator: Christian Rose \n"
 "Language-Team: Swedish \n"
@@ -483,58 +483,51 @@ msgid "Printing Output Mode"
 msgstr ""
 
 #: src/main/print-canon.c:1280 src/main/print-escp2.c:412
-#: src/main/print-lexmark.c:325 src/main/print-olympus.c:1221
-#: src/main/print-pcl.c:1218
-msgid "Cyan Balance"
-msgstr ""
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
+#, fuzzy
+msgid "Cyan Density"
+msgstr "Intensitet:"
 
 #: src/main/print-canon.c:1281 src/main/print-escp2.c:413
-#: src/main/print-lexmark.c:326 src/main/print-olympus.c:1222
-#: src/main/print-pcl.c:1219
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
-msgid "Adjust the cyan balance"
+msgid "Adjust the cyan density"
 msgstr "Justera cyanbalansen på utskriften"
 
 #: src/main/print-canon.c:1288 src/main/print-escp2.c:420
-#: src/main/print-lexmark.c:333 src/main/print-olympus.c:1229
-#: src/main/print-pcl.c:1226
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
-msgid "Magenta Balance"
+msgid "Magenta Density"
 msgstr "Magenta"
 
 #: src/main/print-canon.c:1289 src/main/print-escp2.c:421
-#: src/main/print-lexmark.c:334 src/main/print-olympus.c:1230
-#: src/main/print-pcl.c:1227
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
-msgid "Adjust the magenta balance"
+msgid "Adjust the magenta density"
 msgstr "Justera magentabalansen på utskriften"
 
 #: src/main/print-canon.c:1296 src/main/print-escp2.c:428
-#: src/main/print-lexmark.c:341 src/main/print-olympus.c:1237
-#: src/main/print-pcl.c:1234
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
-msgid "Yellow Balance"
-msgstr "Justera gulbalansen på utskriften"
+msgid "Yellow Density"
+msgstr "Intensitet:"
 
 #: src/main/print-canon.c:1297 src/main/print-escp2.c:429
-#: src/main/print-lexmark.c:342 src/main/print-olympus.c:1238
-#: src/main/print-pcl.c:1235
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
-msgid "Adjust the yellow balance"
+msgid "Adjust the yellow density"
 msgstr "Justera gulbalansen på utskriften"
 
 #: src/main/print-canon.c:1304 src/main/print-escp2.c:436
-#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1245
-#: src/main/print-pcl.c:1242
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
-msgid "Black Balance"
-msgstr "Svartvitt"
+msgid "Black Density"
+msgstr "Intensitet:"
 
 #: src/main/print-canon.c:1305 src/main/print-escp2.c:437
-#: src/main/print-lexmark.c:350 src/main/print-olympus.c:1246
-#: src/main/print-pcl.c:1243
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
-msgid "Adjust the black balance"
+msgid "Adjust the black density"
 msgstr "Justera cyanbalansen på utskriften"
 
 #: src/main/print-canon.c:1312 src/main/print-canon.c:1313
@@ -606,14 +599,14 @@ msgstr "CcMmY-fotof
 msgid "Photo CcMmYK Color"
 msgstr "CcMmYK-fotofärg"
 
-#: src/main/print-canon.c:1812 src/main/print-escp2.c:1738
+#: src/main/print-canon.c:1812 src/main/print-escp2.c:1737
 #: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
 #: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Color"
 msgstr "Färg"
 
-#: src/main/print-canon.c:1814 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:1814 src/main/print-escp2.c:1739
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -681,7 +674,7 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:412
+#: src/main/print-color.c:164 src/main/print-color.c:436
 #, fuzzy
 msgid "Channel "
 msgstr "Avbryt"
@@ -710,7 +703,7 @@ msgid "Color Correction"
 msgstr ""
 
 #: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:313
+#: src/main/print-color.c:223 src/main/print-color.c:337
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
@@ -881,12 +874,47 @@ msgstr "Justera cyanbalansen p
 msgid "Adjust the black gamma"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-color.c:313
+#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+msgid "Cyan Balance"
+msgstr ""
+
+#: src/main/print-color.c:313 src/main/print-color.c:321
+#: src/main/print-color.c:329
+#, fuzzy
+msgid "GrayBalance"
+msgstr "Gråtoner"
+
+#: src/main/print-color.c:314
+#, fuzzy
+msgid "Adjust the cyan gray balance"
+msgstr "Justera cyanbalansen på utskriften"
+
+#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#, fuzzy
+msgid "Magenta Balance"
+msgstr "Magenta"
+
+#: src/main/print-color.c:322
+#, fuzzy
+msgid "Adjust the magenta gray balance"
+msgstr "Justera magentabalansen på utskriften"
+
+#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#, fuzzy
+msgid "Yellow Balance"
+msgstr "Justera gulbalansen på utskriften"
+
+#: src/main/print-color.c:330
+#, fuzzy
+msgid "Adjust the yellow gray balance"
+msgstr "Justera gulbalansen på utskriften"
+
+#: src/main/print-color.c:337
 #, fuzzy
 msgid "Saturation"
 msgstr "Mättnad:"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:338
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -895,184 +923,184 @@ msgstr ""
 "Använd noll som mättnad för att skapa gråskaleutdata med färgbläck och svart "
 "bläck"
 
-#: src/main/print-color.c:324
+#: src/main/print-color.c:348
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Bläcktyp"
 
-#: src/main/print-color.c:324 src/main/print-color.c:332
-#: src/main/print-color.c:340 src/main/print-color.c:348
-#: src/main/print-color.c:511 src/main/print-escp2.c:332
+#: src/main/print-color.c:348 src/main/print-color.c:356
+#: src/main/print-color.c:364 src/main/print-color.c:372
+#: src/main/print-color.c:535 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-color.c:325
+#: src/main/print-color.c:349
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:332
+#: src/main/print-color.c:356
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:333
+#: src/main/print-color.c:357
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:340
+#: src/main/print-color.c:364
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:341
+#: src/main/print-color.c:365
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:372
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:373
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:412
+#: src/main/print-color.c:436
 #, fuzzy
 msgid " Curve"
 msgstr "Svart"
 
-#: src/main/print-color.c:413 src/main/print-color.c:423
-#: src/main/print-color.c:431 src/main/print-color.c:439
-#: src/main/print-color.c:447 src/main/print-color.c:455
-#: src/main/print-color.c:463 src/main/print-color.c:471
-#: src/main/print-color.c:479
+#: src/main/print-color.c:437 src/main/print-color.c:447
+#: src/main/print-color.c:455 src/main/print-color.c:463
+#: src/main/print-color.c:471 src/main/print-color.c:479
+#: src/main/print-color.c:487 src/main/print-color.c:495
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "Output Curves"
 msgstr "Utdatatyp:"
 
-#: src/main/print-color.c:413
+#: src/main/print-color.c:437
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:423
+#: src/main/print-color.c:447
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:424
+#: src/main/print-color.c:448
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Avbryt"
 
-#: src/main/print-color.c:431
+#: src/main/print-color.c:455
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:432
+#: src/main/print-color.c:456
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:439
+#: src/main/print-color.c:463
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:440
+#: src/main/print-color.c:464
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:471
 #, fuzzy
 msgid "Black Curve"
 msgstr "Svart"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:472
 #, fuzzy
 msgid "Black curve"
 msgstr "Svart"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:479
 #, fuzzy
 msgid "Red Curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:480
 #, fuzzy
 msgid "Red curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:487
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:488
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:495
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Svart"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:496
 #, fuzzy
 msgid "Blue curve"
 msgstr "Svart"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:503
 #, fuzzy
 msgid "White Curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:504
 #, fuzzy
 msgid "White curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:511
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:511 src/main/print-color.c:519
+#: src/main/print-color.c:527
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:512
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:519
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Mättnad:"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:520
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:527
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:528
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:535
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:536
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1599
+#: src/main/print-color.c:1620
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1166,8 +1194,8 @@ msgstr ""
 #: src/main/print-escp2-data.c:286 src/main/print-escp2-data.c:314
 #: src/main/print-escp2-data.c:351 src/main/print-escp2-data.c:406
 #: src/main/print-escp2-data.c:452 src/main/print-escp2-data.c:545
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
+#: src/main/print-escp2.c:1493 src/main/print-escp2.c:1590
+#: src/main/print-escp2.c:1602 src/main/print-pcl.c:227
 #: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
 #: src/gutenprintui2/panel.c:2573
 msgid "Standard"
@@ -1456,8 +1484,9 @@ msgid "Adjust the yellow map"
 msgstr "Justera gulbalansen på utskriften"
 
 #: src/main/print-escp2.c:350
+#, fuzzy
 msgid "Blue Map"
-msgstr ""
+msgstr "Svartvitt"
 
 #: src/main/print-escp2.c:351
 #, fuzzy
@@ -1475,22 +1504,22 @@ msgstr "Justera gulbalansen p
 
 #: src/main/print-escp2.c:444
 #, fuzzy
-msgid "Red Balance"
-msgstr "Justera gulbalansen på utskriften"
+msgid "Red Density"
+msgstr "Intensitet:"
 
 #: src/main/print-escp2.c:445
 #, fuzzy
-msgid "Adjust the red balance"
+msgid "Adjust the red density"
 msgstr "Justera gulbalansen på utskriften"
 
 #: src/main/print-escp2.c:452
 #, fuzzy
-msgid "Blue Balance"
-msgstr "Svartvitt"
+msgid "Blue Density"
+msgstr "Intensitet:"
 
 #: src/main/print-escp2.c:453
 #, fuzzy
-msgid "Adjust the blue balance"
+msgid "Adjust the blue density"
 msgstr "Justera cyanbalansen på utskriften"
 
 #: src/main/print-escp2.c:460
@@ -1565,48 +1594,48 @@ msgstr ""
 msgid "Print To Hub"
 msgstr "Skriv ut till fil?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1440 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1567 src/cups/genppd.c:1286
 #, fuzzy
 msgid "Automatic"
 msgstr "Storlek"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1569
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI enkelriktad"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1571
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI enkelriktad"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1604
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1606
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1608
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1610
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1612
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2010
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Skrivaren stöder inte färgutskrift\n"
@@ -1786,6 +1815,31 @@ msgstr "Matte-papper"
 msgid "Laminate Pattern"
 msgstr ""
 
+#: src/main/print-olympus.c:1222
+#, fuzzy
+msgid "Adjust the cyan balance"
+msgstr "Justera cyanbalansen på utskriften"
+
+#: src/main/print-olympus.c:1230
+#, fuzzy
+msgid "Adjust the magenta balance"
+msgstr "Justera magentabalansen på utskriften"
+
+#: src/main/print-olympus.c:1238
+#, fuzzy
+msgid "Adjust the yellow balance"
+msgstr "Justera gulbalansen på utskriften"
+
+#: src/main/print-olympus.c:1245
+#, fuzzy
+msgid "Black Balance"
+msgstr "Svartvitt"
+
+#: src/main/print-olympus.c:1246
+#, fuzzy
+msgid "Adjust the black balance"
+msgstr "Justera cyanbalansen på utskriften"
+
 #: src/main/print-pcl.c:182
 msgid "Plain"
 msgstr "Vanlig"
@@ -5750,6 +5804,10 @@ msgstr "Felaktiga parametrar; kan inte forts
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Hämtande av nästa rad misslyckades vid %.0f\n"
 
+#, fuzzy
+#~ msgid "Red Balance"
+#~ msgstr "Justera gulbalansen på utskriften"
+
 #~ msgid "Printer status requires using a raw device.\n"
 #~ msgstr "Skrivarstatus kräver att en rå enhet används.\n"
 
diff --git a/samples/Makefile.in b/samples/Makefile.in
index 6e4636c..28d3239 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -262,7 +262,6 @@ 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@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 0706352..628cbfa 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -256,7 +256,6 @@ 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@
diff --git a/scripts/config.guess b/scripts/config.guess
index 45bee13..44f30e6 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-04-22'
+timestamp='2005-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -136,6 +136,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_MACHINE}" in
+    i?86)
+	test -z "$VENDOR" && VENDOR=pc
+	;;
+    *)
+	test -z "$VENDOR" && VENDOR=unknown
+	;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -825,25 +835,25 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo cris-axis-linux
 	exit 0 ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo crisv32-axis-linux
 	exit 0 ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+    	echo frv-${VENDOR}-linux
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -862,7 +872,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -881,13 +891,13 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
 	;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-${VENDOR}-linux
 	exit 0 ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-${VENDOR}-linux
 	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -900,34 +910,34 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
 	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
+	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
+	  *)    echo hppa-${VENDOR}-linux ;;
 	esac
 	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-${VENDOR}-linux
 	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo x86_64-${VENDOR}-linux
 	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -942,18 +952,18 @@ EOF
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
 		exit 0 ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
 		exit 0 ;;
 	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# Either a pre-BFD a.out linker (linuxoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
 		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
@@ -982,7 +992,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
@@ -1140,10 +1150,6 @@ EOF
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
 	exit 0 ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit 0 ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
@@ -1423,9 +1429,7 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+    ftp://ftp.gnu.org/pub/gnu/config/
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/scripts/config.sub b/scripts/config.sub
index 87a1ee4..c884ad4 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-04-22'
+timestamp='2005-02-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -231,7 +231,6 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
@@ -263,8 +262,7 @@ case $basic_machine in
 	| pyramid \
 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
@@ -300,7 +298,7 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bfin-* | bs2000-* \
+	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -338,8 +336,7 @@ case $basic_machine in
 	| romp-* | rs6000-* \
 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -1175,7 +1172,7 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@@ -1208,9 +1205,6 @@ case $os in
 	-linux-dietlibc)
 		os=-linux-dietlibc
 		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
diff --git a/scripts/ltmain.sh b/scripts/ltmain.sh
index 1a224ac..5eb4c3a 100644
--- a/scripts/ltmain.sh
+++ b/scripts/ltmain.sh
@@ -1,7 +1,7 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
 # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit , 1996
 #
@@ -24,29 +24,6 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
-
-
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
@@ -59,7 +36,7 @@ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
   :
 else
   # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
 fi
 
 if test "X$1" = X--fallback-echo; then
@@ -68,9 +45,19 @@ if test "X$1" = X--fallback-echo; then
   cat <&2
   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
+  exit 1
 fi
 
 # Global variables.
@@ -132,13 +119,10 @@ o2lo="s/\\.${objext}\$/.lo/"
 # Shell function definitions:
 # This seems to be the best place for them
 
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
-func_win32_libid () {
+win32_libid () {
   win32_libid_type="unknown"
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
@@ -147,7 +131,7 @@ func_win32_libid () {
     ;;
   *ar\ archive*) # could be an import, or static
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
 	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
       if test "X$win32_nmres" = "Ximport" ; then
@@ -157,7 +141,7 @@ func_win32_libid () {
       fi
     fi
     ;;
-  *DLL*)
+  *DLL*) 
     win32_libid_type="x86 DLL"
     ;;
   *executable*) # but shell scripts are "executable" too...
@@ -171,76 +155,9 @@ func_win32_libid () {
   $echo $win32_libid_type
 }
 
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag () {
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
 # End of Shell function definitions
 #####################################
 
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
 # Parse our command line options once, thoroughly.
 while test "$#" -gt 0
 do
@@ -266,7 +183,7 @@ do
       case $tagname in
       *[!-_A-Za-z0-9,/]*)
 	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
+	exit 1
 	;;
       esac
 
@@ -276,10 +193,10 @@ do
 	# not specially marked.
 	;;
       *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
 	  taglist="$taglist $tagname"
 	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
 	else
 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
 	fi
@@ -308,16 +225,16 @@ do
     $echo "Copyright (C) 2003  Free Software Foundation, Inc."
     $echo "This is free software; see the source for copying conditions.  There is NO"
     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $EXIT_SUCCESS
+    exit 0
     ;;
 
   --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
     # Now print the configurations for the tags.
     for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
     done
-    exit $EXIT_SUCCESS
+    exit 0
     ;;
 
   --debug)
@@ -342,7 +259,7 @@ do
     else
       $echo "disable static libraries"
     fi
-    exit $EXIT_SUCCESS
+    exit 0
     ;;
 
   --finish) mode="finish" ;;
@@ -373,7 +290,7 @@ do
   -*)
     $echo "$modename: unrecognized option \`$arg'" 1>&2
     $echo "$help" 1>&2
-    exit $EXIT_FAILURE
+    exit 1
     ;;
 
   *)
@@ -386,7 +303,7 @@ done
 if test -n "$prevopt"; then
   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
   $echo "$help" 1>&2
-  exit $EXIT_FAILURE
+  exit 1
 fi
 
 # If this variable is set in any of the actions, the command in it
@@ -442,7 +359,7 @@ if test -z "$show_help"; then
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
     $echo "$help" 1>&2
-    exit $EXIT_FAILURE
+    exit 1
   fi
 
   # Change the help message to a mode-specific one.
@@ -484,7 +401,7 @@ if test -z "$show_help"; then
 	-o)
 	  if test -n "$libobj" ; then
 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
 	  arg_mode=target
 	  continue
@@ -509,7 +426,7 @@ if test -z "$show_help"; then
 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
 	  lastarg=
 	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
+	  for arg in $args; do
 	    IFS="$save_ifs"
 
 	    # Double-quote args containing other shell metacharacters.
@@ -559,11 +476,11 @@ if test -z "$show_help"; then
     case $arg_mode in
     arg)
       $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
+      exit 1
       ;;
     target)
       $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
+      exit 1
       ;;
     *)
       # Get the name of the library object.
@@ -596,11 +513,50 @@ if test -z "$show_help"; then
     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
     *)
       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
+      exit 1
       ;;
     esac
 
-    func_infer_tag $base_compile
+    # Infer tagged configuration to use if any are available and
+    # if one wasn't chosen via the "--tag" command line option.
+    # Only attempt this if the compiler in the base compile
+    # command doesn't match the default compiler.
+    if test -n "$available_tags" && test -z "$tagname"; then
+      case $base_compile in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+	    case "$base_compile " in
+	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit 1
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
 
     for arg in $later; do
       case $arg in
@@ -633,7 +589,7 @@ if test -z "$show_help"; then
     if test -z "$base_compile"; then
       $echo "$modename: you must specify a compilation command" 1>&2
       $echo "$help" 1>&2
-      exit $EXIT_FAILURE
+      exit 1
     fi
 
     # Delete any leftover library objects.
@@ -644,7 +600,7 @@ if test -z "$show_help"; then
     fi
 
     $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+    trap "$run $rm $removelist; exit 1" 1 2 15
 
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
@@ -663,7 +619,7 @@ if test -z "$show_help"; then
       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
       removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+      trap "$run $rm $removelist; exit 1" 1 2 15
     else
       output_obj=
       need_locks=no
@@ -673,7 +629,7 @@ if test -z "$show_help"; then
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+      until $run ln "$0" "$lockfile" 2>/dev/null; do
 	$show "Waiting for $lockfile to be removed"
 	sleep 2
       done
@@ -691,7 +647,7 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
 	$run $rm $removelist
-	exit $EXIT_FAILURE
+	exit 1
       fi
       $echo $srcfile > "$lockfile"
     fi
@@ -746,7 +702,7 @@ EOF
       if $run eval "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
+	exit 1
       fi
 
       if test "$need_locks" = warn &&
@@ -766,7 +722,7 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
 	$run $rm $removelist
-	exit $EXIT_FAILURE
+	exit 1
       fi
 
       # Just move the object if needed, then go on to compile the next one
@@ -818,7 +774,7 @@ EOF
       if $run eval "$command"; then :
       else
 	$run $rm $removelist
-	exit $EXIT_FAILURE
+	exit 1
       fi
 
       if test "$need_locks" = warn &&
@@ -838,7 +794,7 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
 	$run $rm $removelist
-	exit $EXIT_FAILURE
+	exit 1
       fi
 
       # Just move the object if needed
@@ -876,7 +832,7 @@ EOF
       $run $rm "$lockfile"
     fi
 
-    exit $EXIT_SUCCESS
+    exit 0
     ;;
 
   # libtool link mode
@@ -948,7 +904,46 @@ EOF
     vinfo=
     vinfo_number=no
 
-    func_infer_tag $base_compile
+    # Infer tagged configuration to use if any are available and
+    # if one wasn't chosen via the "--tag" command line option.
+    # Only attempt this if the compiler in the base link
+    # command doesn't match the default compiler.
+    if test -n "$available_tags" && test -z "$tagname"; then
+      case $base_compile in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+	    case $base_compile in
+	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+	      # The compiler in $compile_command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit 1
+#       else
+#         $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
 
     # We need to know -static, to get the right output filenames.
     for arg
@@ -1044,7 +1039,7 @@ EOF
 	  export_symbols="$arg"
 	  if test ! -f "$arg"; then
 	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
 	  prev=
 	  continue
@@ -1096,7 +1091,7 @@ EOF
 		   test "$pic_object" = none && \
 		   test "$non_pic_object" = none; then
 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
+		  exit 1
 		fi
 
 		# Extract subdirectory from the argument.
@@ -1149,7 +1144,7 @@ EOF
 		# Only an error if not doing a dry-run.
 		if test -z "$run"; then
 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
+		  exit 1
 		else
 		  # Dry-run case.
 
@@ -1170,7 +1165,7 @@ EOF
 	    done
 	  else
 	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
 	  arg=$save_arg
 	  prev=
@@ -1182,7 +1177,7 @@ EOF
 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
 	  *)
 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	    ;;
 	  esac
 	  if test "$prev" = rpath; then
@@ -1222,11 +1217,6 @@ EOF
 	  finalize_command="$finalize_command $qarg"
 	  continue
 	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
 	*)
 	  eval "$prev=\"\$arg\""
 	  prev=
@@ -1275,7 +1265,7 @@ EOF
       -export-symbols | -export-symbols-regex)
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 	if test "X$arg" = "X-export-symbols"; then
 	  prev=expsyms
@@ -1311,7 +1301,7 @@ EOF
 	  absdir=`cd "$dir" && pwd`
 	  if test -z "$absdir"; then
 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
 	  dir="$absdir"
 	  ;;
@@ -1462,7 +1452,7 @@ EOF
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
 	*)
 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	  ;;
 	esac
 	case "$xrpath " in
@@ -1585,7 +1575,7 @@ EOF
 	     test "$pic_object" = none && \
 	     test "$non_pic_object" = none; then
 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
 
 	  # Extract subdirectory from the argument.
@@ -1638,7 +1628,7 @@ EOF
 	  # Only an error if not doing a dry-run.
 	  if test -z "$run"; then
 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	  else
 	    # Dry-run case.
 
@@ -1705,7 +1695,7 @@ EOF
     if test -n "$prev"; then
       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
       $echo "$help" 1>&2
-      exit $EXIT_FAILURE
+      exit 1
     fi
 
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
@@ -1749,7 +1739,7 @@ EOF
     "")
       $echo "$modename: you must specify an output file" 1>&2
       $echo "$help" 1>&2
-      exit $EXIT_FAILURE
+      exit 1
       ;;
     *.$libext) linkmode=oldlib ;;
     *.lo | *.$objext) linkmode=obj ;;
@@ -1759,7 +1749,7 @@ EOF
 
     case $host in
     *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
+      # don't eliminate duplcations in $postdeps and $predeps
       duplicate_compiler_generated_deps=yes
       ;;
     *)
@@ -1812,7 +1802,7 @@ EOF
 	  *.la) ;;
 	  *)
 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	    ;;
 	  esac
 	done
@@ -1838,10 +1828,7 @@ EOF
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -1867,9 +1854,13 @@ EOF
 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
 	    continue
 	  fi
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $std_shrext .so .a; do
+	    for search_ext in .la $shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
 	      if test -f "$lib"; then
@@ -1945,11 +1936,11 @@ EOF
 	    fi
 	    if test "$pass" = scan; then
 	      deplibs="$deplib $deplibs"
+	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    ;;
 	  *)
 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
@@ -2028,14 +2019,14 @@ EOF
 	if test "$found" = yes || test -f "$lib"; then :
 	else
 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 
 	# Check to see that this really is a libtool archive.
 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
 	else
 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 
 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
@@ -2071,7 +2062,7 @@ EOF
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
+	      exit 1
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
@@ -2088,12 +2079,12 @@ EOF
 	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
 	  continue
 	fi # $pass = conv
 
-
+    
 	# Get the name of the library we link against.
 	linklib=
 	for l in $old_library $library_names; do
@@ -2101,18 +2092,16 @@ EOF
 	done
 	if test -z "$linklib"; then
 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 
 	# This library was specified with -dlopen.
 	if test "$pass" = dlopen; then
 	  if test -z "$libdir"; then
 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
+	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
 	    # If there is no dlname, no dlopen support or we're linking
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
@@ -2161,7 +2150,7 @@ EOF
 	if test "$pass" = dlpreopen; then
 	  if test -z "$libdir"; then
 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
 	  # are required to link).
@@ -2188,7 +2177,7 @@ EOF
 	  continue
 	fi
 
-
+    
 	if test "$linkmode" = prog && test "$pass" != link; then
 	  newlib_search_path="$newlib_search_path $ladir"
 	  deplibs="$lib $deplibs"
@@ -2275,18 +2264,17 @@ EOF
 	    need_relink=yes
 	  fi
 	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
+	
+      # Warn about portability, can't link against -module's on some systems (darwin)
+      if test "$shouldnotlink" = yes && test "$pass" = link ; then
 	    $echo
 	    if test "$linkmode" = prog; then
 	      $echo "*** Warning: Linking the executable $output against the loadable module"
 	    else
 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
 	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
+	    $echo "*** $linklib is not portable!"    
+      fi	  
 	  if test "$linkmode" = lib &&
 	     test "$hardcode_into_libs" = yes; then
 	    # Hardcode the library path.
@@ -2384,9 +2372,9 @@ EOF
 		case $host in
 		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
 		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+		    # if the lib is a module then we can not link against it, someone
+		    # is ignoring the new warnings I added
+		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
 		      $echo "** Warning, lib $linklib is a module, not a shared library"
 		      if test -z "$old_library" ; then
 		        $echo
@@ -2394,7 +2382,7 @@ EOF
 		        $echo "** The link will probably fail, sorry"
 		      else
 		        add="$dir/$old_library"
-		      fi
+		      fi 
 		    fi
 		esac
 	      elif test "$hardcode_minus_L" = no; then
@@ -2436,7 +2424,7 @@ EOF
 
 	    if test "$lib_linked" != yes; then
 	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
+	      exit 1
 	    fi
 
 	    if test -n "$add_shlibpath"; then
@@ -2479,8 +2467,7 @@ EOF
 	      esac
 	      add="-l$name"
 	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
 	        add="$inst_prefix_dir$libdir/$linklib"
 	      else
 	        add="$libdir/$linklib"
@@ -2560,8 +2547,7 @@ EOF
 
 	if test "$linkmode" = lib; then
 	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
+	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
 	       test "$link_static" = yes; }; then
 	    # Extract -R from dependency_libs
 	    temp_deplibs=
@@ -2618,7 +2604,7 @@ EOF
 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -z "$libdir"; then
 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
+		    exit 1
 		  fi
 		  if test "$absdir" != "$libdir"; then
 		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
@@ -2628,8 +2614,7 @@ EOF
 		depdepl=
 		case $host in
 		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
+		  # we do not want to link against static libs, but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
@@ -2637,7 +2622,7 @@ EOF
 		    done
 		    if test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
-		    fi
+		   fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
 		    *" $path "*) ;;
@@ -2647,32 +2632,33 @@ EOF
 		  path=""
 		  ;;
 		*)
-		  path="-L$path"
-		  ;;
-		esac
+		path="-L$path"
+		;;
+		esac 
+		
 		;;
-	      -l*)
+		  -l*)
 		case $host in
 		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
+		 # Again, we only want to link against shared libraries
+		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+		 for tmp in $newlib_search_path ; do
+		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+		       eval depdepl="$tmp/lib$tmp_libs.dylib"
+		       break
+		     fi  
+         done
+         path=""
 		  ;;
 		*) continue ;;
-		esac
+		esac  		  
 		;;
 	      *) continue ;;
 	      esac
 	      case " $deplibs " in
 	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
+	      *) deplibs="$deplibs $depdepl" ;;
+	      esac	      
 	      case " $deplibs " in
 	      *" $path "*) ;;
 	      *) deplibs="$deplibs $path" ;;
@@ -2762,8 +2748,7 @@ EOF
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
+      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
       tmp_libs=
       for i in $dependency_libs ; do
 	case " $predeps $postdeps $compiler_lib_search_path " in
@@ -2823,19 +2808,19 @@ EOF
       case $outputname in
       lib*)
 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
+	eval shared_ext=\"$shrext\"
 	eval libname=\"$libname_spec\"
 	;;
       *)
 	if test "$module" = no; then
 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
 	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 	if test "$need_lib_prefix" != no; then
 	  # Add the "lib" prefix for modules if required
 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
+	  eval shared_ext=\"$shrext\"
 	  eval libname=\"$libname_spec\"
 	else
 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
@@ -2846,7 +2831,7 @@ EOF
       if test -n "$objs"; then
 	if test "$deplibs_check_method" != pass_all; then
 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
+	  exit 1
 	else
 	  $echo
 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
@@ -2894,13 +2879,13 @@ EOF
 	if test -n "$8"; then
 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
 	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
 	# to make the code below a bit more comprehensible
-
+	
 	case $vinfo_number in
 	yes)
 	  number_major="$2"
@@ -2929,11 +2914,6 @@ EOF
 	    age="$number_minor"
 	    revision="$number_minor"
 	    ;;
-	  *)
-	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
 	  esac
 	  ;;
 	no)
@@ -2945,36 +2925,36 @@ EOF
 
 	# Check that each of the things are valid numbers.
 	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
 	*)
 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	  ;;
 	esac
 
 	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
 	*)
 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	  ;;
 	esac
 
 	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
 	*)
 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	  ;;
 	esac
 
 	if test "$age" -gt "$current"; then
 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 
 	# Calculate the version variables.
@@ -3063,7 +3043,7 @@ EOF
 	*)
 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	  ;;
 	esac
 
@@ -3117,11 +3097,9 @@ EOF
 	    *.$objext)
 	       ;;
 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
+	       if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+	       then
+		 continue
 	       fi
 	       removelist="$removelist $p"
 	       ;;
@@ -3602,7 +3580,7 @@ EOF
 	fi
 
 	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
+	eval shared_ext=\"$shrext\"
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
 	realname="$2"
@@ -3666,12 +3644,12 @@ EOF
 	for test_deplib in $deplibs; do
 		case " $convenience " in
 		*" $test_deplib "*) ;;
-		*)
+		*) 
 			tmp_deplibs="$tmp_deplibs $test_deplib"
 			;;
 		esac
 	done
-	deplibs="$tmp_deplibs"
+	deplibs="$tmp_deplibs" 
 
 	if test -n "$convenience"; then
 	  if test -n "$whole_archive_flag_spec"; then
@@ -3854,6 +3832,7 @@ EOF
 	  save_ifs="$IFS"; IFS='~'
 	  for cmd in $concat_cmds; do
 	    IFS="$save_ifs"
+	    eval cmd=\"$cmd\"
 	    $show "$cmd"
 	    $run eval "$cmd" || exit $?
 	  done
@@ -3900,7 +3879,7 @@ EOF
 	# Restore the uninstalled library and exit
 	if test "$mode" = relink; then
 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-	  exit $EXIT_SUCCESS
+	  exit 0
 	fi
 
 	# Create links to the real library.
@@ -3948,7 +3927,7 @@ EOF
       *.lo)
 	if test -n "$objs$old_deplibs"; then
 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 	libobj="$output"
 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
@@ -4059,7 +4038,7 @@ EOF
 	  $run ${rm}r $gentop
 	fi
 
-	exit $EXIT_SUCCESS
+	exit 0
       fi
 
       if test "$build_libtool_libs" != yes; then
@@ -4072,7 +4051,7 @@ EOF
 	# accidentally link it into a program.
 	# $show "echo timestamp > $libobj"
 	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
+	exit 0
       fi
 
       if test -n "$pic_flag" || test "$pic_mode" != default; then
@@ -4095,7 +4074,7 @@ EOF
 	$run ${rm}r $gentop
       fi
 
-      exit $EXIT_SUCCESS
+      exit 0
       ;;
 
     prog)
@@ -4413,7 +4392,7 @@ static const void *lt_preloaded_setup() {
 	  ;;
 	*)
 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	  ;;
 	esac
       else
@@ -4501,7 +4480,7 @@ static const void *lt_preloaded_setup() {
 	# Link the executable and exit
 	$show "$link_command"
 	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
+	exit 0
       fi
 
       if test "$hardcode_action" = relink; then
@@ -4556,10 +4535,10 @@ static const void *lt_preloaded_setup() {
       fi
 
       # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+	case $0 in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
 	esac
 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
       else
@@ -4585,7 +4564,7 @@ static const void *lt_preloaded_setup() {
 	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
 	    cwrapper=`$echo ${output}.exe`
 	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
 
 	    cat > $cwrappersource < $output "\
 #! $SHELL
@@ -4894,7 +4873,7 @@ else
       else
 	$echo \"\$relink_command_output\" >&2
 	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
+	exit 1
       fi
     fi
 
@@ -4956,20 +4935,20 @@ else
 	esac
 	$echo >> $output "\
       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit $EXIT_FAILURE
+      exit 1
     fi
   else
     # The program doesn't exist.
     \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
     \$echo \"This script is just a wrapper for \$program.\" 1>&2
     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
+    exit 1
   fi
 fi\
 "
 	chmod +x $output
       fi
-      exit $EXIT_SUCCESS
+      exit 0
       ;;
     esac
 
@@ -5088,7 +5067,7 @@ fi\
 	  for obj in $save_oldobjs
 	  do
 	    last_oldobj=$obj
-	  done
+	  done  
 	  for obj in $save_oldobjs
 	  do
 	    oldobjs="$objlist $obj"
@@ -5102,7 +5081,7 @@ fi\
 	      oldobjs=$objlist
 	      if test "$obj" = "$last_oldobj" ; then
 	        RANLIB=$save_RANLIB
-	      fi
+	      fi  
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
 	      objlist=
@@ -5151,13 +5130,11 @@ fi\
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
+        relink_command=
+      fi  
       # Only create the output if not a dry run.
       if test -z "$run"; then
 	for installed in no yes; do
@@ -5175,7 +5152,7 @@ fi\
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		if test -z "$libdir"; then
 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
+		  exit 1
 		fi
 		newdependency_libs="$newdependency_libs $libdir/$name"
 		;;
@@ -5189,7 +5166,7 @@ fi\
 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 	      if test -z "$libdir"; then
 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
+		exit 1
 	      fi
 	      newdlfiles="$newdlfiles $libdir/$name"
 	    done
@@ -5200,7 +5177,7 @@ fi\
 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 	      if test -z "$libdir"; then
 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
+		exit 1
 	      fi
 	      newdlprefiles="$newdlprefiles $libdir/$name"
 	    done
@@ -5208,7 +5185,7 @@ fi\
 	  else
 	    newdlfiles=
 	    for lib in $dlfiles; do
-	      case $lib in
+	      case $lib in 
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
@@ -5217,7 +5194,7 @@ fi\
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
-	      case $lib in
+	      case $lib in 
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
@@ -5280,7 +5257,7 @@ relink_command=\"$relink_command\""
       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
       ;;
     esac
-    exit $EXIT_SUCCESS
+    exit 0
     ;;
 
   # libtool install mode
@@ -5369,13 +5346,13 @@ relink_command=\"$relink_command\""
     if test -z "$install_prog"; then
       $echo "$modename: you must specify an install program" 1>&2
       $echo "$help" 1>&2
-      exit $EXIT_FAILURE
+      exit 1
     fi
 
     if test -n "$prev"; then
       $echo "$modename: the \`$prev' option requires an argument" 1>&2
       $echo "$help" 1>&2
-      exit $EXIT_FAILURE
+      exit 1
     fi
 
     if test -z "$files"; then
@@ -5385,7 +5362,7 @@ relink_command=\"$relink_command\""
 	$echo "$modename: you must specify a destination" 1>&2
       fi
       $echo "$help" 1>&2
-      exit $EXIT_FAILURE
+      exit 1
     fi
 
     # Strip any trailing slash from the destination.
@@ -5406,7 +5383,7 @@ relink_command=\"$relink_command\""
       if test "$#" -gt 2; then
 	$echo "$modename: \`$dest' is not a directory" 1>&2
 	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
+	exit 1
       fi
     fi
     case $destdir in
@@ -5418,7 +5395,7 @@ relink_command=\"$relink_command\""
 	*)
 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
 	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	  ;;
 	esac
       done
@@ -5447,7 +5424,7 @@ relink_command=\"$relink_command\""
 	else
 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
 	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 
 	library_names=
@@ -5489,7 +5466,7 @@ relink_command=\"$relink_command\""
 	  # but it's something to keep an eye on.
 	  if test "$inst_prefix_dir" = "$destdir"; then
 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
 
 	  if test -n "$inst_prefix_dir"; then
@@ -5504,7 +5481,7 @@ relink_command=\"$relink_command\""
 	  if $run eval "$relink_command"; then :
 	  else
 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
 	fi
 
@@ -5583,7 +5560,7 @@ relink_command=\"$relink_command\""
 	*)
 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
 	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	  ;;
 	esac
 
@@ -5601,7 +5578,7 @@ relink_command=\"$relink_command\""
 	  $show "$install_prog $staticobj $staticdest"
 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
 	fi
-	exit $EXIT_SUCCESS
+	exit 0
 	;;
 
       *)
@@ -5655,7 +5632,7 @@ relink_command=\"$relink_command\""
 	  # Check the variables that should have been set.
 	  if test -z "$notinst_deplibs"; then
 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
+	    exit 1
 	  fi
 
 	  finalize=yes
@@ -5695,15 +5672,14 @@ relink_command=\"$relink_command\""
 	    if test "$finalize" = yes && test -z "$run"; then
 	      tmpdir="/tmp"
 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      save_umask=`umask`
-	      umask 0077
-	      if $mkdir "$tmpdir"; then
-	        umask $save_umask
+              if tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`; then :
 	      else
-	        umask $save_umask
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
+                tmpdir="$tmpdir/libtool-$$"
+		if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
+		else
+		  $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+		  continue
+		fi
 	      fi
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
@@ -5784,9 +5760,9 @@ relink_command=\"$relink_command\""
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+      exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
     else
-      exit $EXIT_SUCCESS
+      exit 0
     fi
     ;;
 
@@ -5826,7 +5802,7 @@ relink_command=\"$relink_command\""
     fi
 
     # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
+    test "$show" = : && exit 0
 
     $echo "----------------------------------------------------------------------"
     $echo "Libraries have been installed in:"
@@ -5862,7 +5838,7 @@ relink_command=\"$relink_command\""
     $echo "See any operating system documentation about shared libraries for"
     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
     $echo "----------------------------------------------------------------------"
-    exit $EXIT_SUCCESS
+    exit 0
     ;;
 
   # libtool execute mode
@@ -5874,7 +5850,7 @@ relink_command=\"$relink_command\""
     if test -z "$cmd"; then
       $echo "$modename: you must specify a COMMAND" 1>&2
       $echo "$help"
-      exit $EXIT_FAILURE
+      exit 1
     fi
 
     # Handle -dlopen flags immediately.
@@ -5882,7 +5858,7 @@ relink_command=\"$relink_command\""
       if test ! -f "$file"; then
 	$echo "$modename: \`$file' is not a file" 1>&2
 	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
+	exit 1
       fi
 
       dir=
@@ -5893,7 +5869,7 @@ relink_command=\"$relink_command\""
 	else
 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
 	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 
 	# Read the libtool library.
@@ -5920,7 +5896,7 @@ relink_command=\"$relink_command\""
 	  dir="$dir/$objdir"
 	else
 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
+	  exit 1
 	fi
 	;;
 
@@ -5992,15 +5968,15 @@ relink_command=\"$relink_command\""
       fi
 
       # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
+      exec_cmd="\"\$cmd\"$args"
     else
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
 	$echo "export $shlibpath_var"
       fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
+      eval \$echo \"\$cmd\"$args
+      exit 0
     fi
     ;;
 
@@ -6028,7 +6004,7 @@ relink_command=\"$relink_command\""
     if test -z "$rm"; then
       $echo "$modename: you must specify an RM program" 1>&2
       $echo "$help" 1>&2
-      exit $EXIT_FAILURE
+      exit 1
     fi
 
     rmdirs=
@@ -6142,7 +6118,7 @@ relink_command=\"$relink_command\""
 	if test "$mode" = clean ; then
 	  noexename=$name
 	  case $file in
-	  *.exe)
+	  *.exe) 
 	    file=`$echo $file|${SED} 's,.exe$,,'`
 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
 	    # $file with .exe has already been added to rmfiles,
@@ -6187,20 +6163,20 @@ relink_command=\"$relink_command\""
   "")
     $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
+    exit 1
     ;;
   esac
 
   if test -z "$exec_cmd"; then
     $echo "$modename: invalid operation mode \`$mode'" 1>&2
     $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
+    exit 1
   fi
 fi # test -z "$show_help"
 
 if test -n "$exec_cmd"; then
   eval exec $exec_cmd
-  exit $EXIT_FAILURE
+  exit 1
 fi
 
 # We need to display help for each of the modes.
@@ -6236,7 +6212,7 @@ MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
 a more detailed description of MODE.
 
 Report bugs to ."
-  exit $EXIT_SUCCESS
+  exit 0
   ;;
 
 clean)
@@ -6391,14 +6367,14 @@ Otherwise, only FILE itself is deleted using RM."
 *)
   $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
-  exit $EXIT_FAILURE
+  exit 1
   ;;
 esac
 
 $echo
 $echo "Try \`$modename --help' for more information about other modes."
 
-exit $EXIT_SUCCESS
+exit 0
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
diff --git a/scripts/mkchlog b/scripts/mkchlog
index 55b03ac..a51c034 100755
--- a/scripts/mkchlog
+++ b/scripts/mkchlog
@@ -136,7 +136,7 @@ while (<>) {
 		last;
 	    } elsif (/^=============================================================================$/) {
 		last;
-	    } elsif ($firstline && /^branches:[ \t]+[0-9]+(\.[0-9]+)+;$/) {
+	    } elsif ($firstline && /^branches:([ \t]+[0-9]+(\.[0-9]+)+;)+$/) {
 		next;
 	    } else {
 		$body .= $_;
diff --git a/src/Makefile.in b/src/Makefile.in
index 44b9ba4..48de6f0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -261,7 +261,6 @@ 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@
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index cba2fe5..bb55b9e 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -336,7 +336,6 @@ 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@
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index c48723c..42f7cd9 100644
--- a/src/cups/cups-genppdupdate.in
+++ b/src/cups/cups-genppdupdate.in
@@ -1,5 +1,5 @@
 #! @PERL@ -w
-# $Id: cups-genppdupdate.in,v 1.19 2005/04/30 11:48:26 rleigh Exp $
+# $Id: cups-genppdupdate.in,v 1.20 2005/07/04 23:07:11 rleigh Exp $
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
 #
@@ -427,8 +427,7 @@ sub find_ppd ($$$$) {
 # Check that it is a regular file, owned by root.root, not writable
 # by other, and is readable by root.  i.e. the file is secure.
 		    my @sb = stat $fn or next;
-		    if (S_ISREG($sb[2]) && ($sb[4] == 0) && ($sb[5] == 0)) {
-#			!(S_IWOTH & $sb[2]) && (S_IRUSR & $sb[2])) {
+		    if (S_ISREG($sb[2]) && ($sb[4] == 0)) {
 			# Check that the file is a valid Gutenprint PPD file
 			# of the correct version.
 			my $file_version;
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index 7b1b77a..1e4adc4 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -277,7 +277,6 @@ 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@
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index 761df60..a9abef7 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -295,7 +295,6 @@ 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@
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index 566a4f6..345fd21 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -282,7 +282,6 @@ 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@
diff --git a/src/gimp/Makefile.in b/src/gimp/Makefile.in
index 8282702..5cc1000 100644
--- a/src/gimp/Makefile.in
+++ b/src/gimp/Makefile.in
@@ -277,7 +277,6 @@ 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@
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index 897d99e..daae3f6 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -277,7 +277,6 @@ 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@
diff --git a/src/gutenprintui/Makefile.in b/src/gutenprintui/Makefile.in
index 88b87b1..a741fb8 100644
--- a/src/gutenprintui/Makefile.in
+++ b/src/gutenprintui/Makefile.in
@@ -296,7 +296,6 @@ 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@
diff --git a/src/gutenprintui/printrcl.c b/src/gutenprintui/printrcl.c
index 341c76d..e1718e4 100644
--- a/src/gutenprintui/printrcl.c
+++ b/src/gutenprintui/printrcl.c
@@ -1,85 +1,32 @@
-
-#line 3 "printrcl.c"
-
-#define  YY_INT_ALIGNED short int
-
 /* A lexical scanner generated by flex */
 
+/* Scanner skeleton version:
+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ */
+
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 31
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
 
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
 #include 
-#include 
-#include 
-#include 
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
 
-/* C99 systems have . Non-C99 systems may or may not. */
 
-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#include 
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
 #endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
 
+#include 
+#include 
+
+/* Use prototypes in function declarations. */
+#define YY_USE_PROTOS
+
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
@@ -87,17 +34,34 @@ typedef unsigned int flex_uint32_t;
 
 #if __STDC__
 
+#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
+#ifdef __TURBOC__
+ #pragma warn -rch
+ #pragma warn -use
+#include 
+#include 
+#define YY_USE_CONST
+#define YY_USE_PROTOS
+#endif
+
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
+
+#ifdef YY_USE_PROTOS
+#define YY_PROTO(proto) proto
+#else
+#define YY_PROTO(proto) ()
+#endif
+
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -112,71 +76,71 @@ typedef unsigned int flex_uint32_t;
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN (yy_start) = 1 + 2 *
+#define BEGIN yy_start = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START (((yy_start) - 1) / 2)
+#define YY_START ((yy_start - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
+#define YY_NEW_FILE yyrestart( yyin )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
-#endif
 
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
 
 extern int yyleng;
-
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
+/* The funky do-while in the following #define is used to turn the definition
+ * int a single C statement (which needs a semi-colon terminator).  This
+ * avoids problems with code like:
+ *
+ * 	if ( condition_holds )
+ *		yyless( 5 );
+ *	else
+ *		do_something_else();
+ *
+ * Prior to using the do-while the compiler would get upset at the
+ * "else" because it interpreted the "if" statement as being all
+ * done when it reached the ';' after the yyless() call.
+ */
+
+/* Return all but the first 'n' matched characters back to the input stream. */
+
 #define yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
+		*yy_cp = yy_hold_char; \
 		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, (yytext_ptr)  )
+#define unput(c) yyunput( c, yytext_ptr )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
 typedef unsigned int yy_size_t;
-#endif
 
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
+
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -213,16 +177,12 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
-
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -236,33 +196,23 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-
 	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE yy_current_buffer = 0;
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
- *
- * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
+#define YY_CURRENT_BUFFER yy_current_buffer
 
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
+
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+
+
 int yyleng;
 
 /* Points to current character in buffer. */
@@ -275,93 +225,69 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+void yyrestart YY_PROTO(( FILE *input_file ));
 
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
+void yy_load_buffer_state YY_PROTO(( void ));
+YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
+void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
+void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
 
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
+YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
+YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
+YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
 
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
+static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
 
-#define yywrap(n) 1
-#define YY_SKIP_YYWRAP
 
+#define yywrap() 1
+#define YY_SKIP_YYWRAP
 typedef unsigned char YY_CHAR;
-
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
 typedef int yy_state_type;
-
-extern int yylineno;
-
-int yylineno = 1;
-
 extern char *yytext;
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
+static yy_state_type yy_get_previous_state YY_PROTO(( void ));
+static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
+static int yy_get_next_buffer YY_PROTO(( void ));
+static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
+	yytext_ptr = yy_bp; \
+	yyleng = (int) (yy_cp - yy_bp); \
+	yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
+	yy_c_buf_p = yy_cp;
 
 #define YY_NUM_RULES 40
 #define YY_END_OF_BUFFER 41
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept[335] =
+static yyconst short int yy_accept[335] =
     {   0,
         0,    0,   41,   40,   37,   39,   40,   38,   40,   40,
        31,   35,   35,   35,   35,   35,   35,   35,   35,   35,
@@ -402,7 +328,7 @@ static yyconst flex_int16_t yy_accept[335] =
         0,    2,   18,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -434,7 +360,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[39] =
+static yyconst int yy_meta[39] =
     {   0,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    3,
         3,    1,    3,    3,    3,    3,    3,    3,    3,    3,
@@ -442,7 +368,7 @@ static yyconst flex_int32_t yy_meta[39] =
         3,    3,    3,    3,    3,    3,    3,    3
     } ;
 
-static yyconst flex_int16_t yy_base[340] =
+static yyconst short int yy_base[340] =
     {   0,
         0,    0,  374,  375,  371,  375,  368,  343,  364,   29,
        32,  336,  341,   18,   26,   21,   32,  343,    0,  340,
@@ -483,7 +409,7 @@ static yyconst flex_int16_t yy_base[340] =
        81,  375,  375,  375,   94,   97,  100,   89,  103
     } ;
 
-static yyconst flex_int16_t yy_def[340] =
+static yyconst short int yy_def[340] =
     {   0,
       334,    1,  334,  334,  334,  334,  335,  336,  337,  334,
       334,  338,  338,  338,  338,  338,  338,  338,  338,  338,
@@ -524,7 +450,7 @@ static yyconst flex_int16_t yy_def[340] =
       334,  334,  334,    0,  334,  334,  334,  334,  334
     } ;
 
-static yyconst flex_int16_t yy_nxt[414] =
+static yyconst short int yy_nxt[414] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        11,    4,    4,   12,   13,   14,   15,   16,   17,   18,
@@ -574,7 +500,7 @@ static yyconst flex_int16_t yy_nxt[414] =
       334,  334,  334
     } ;
 
-static yyconst flex_int16_t yy_chk[414] =
+static yyconst short int yy_chk[414] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -627,9 +553,6 @@ static yyconst flex_int16_t yy_chk[414] =
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
  */
@@ -639,6 +562,7 @@ int yy_flex_debug = 0;
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "printrcl.l"
+#define INITIAL 0
 /*		-*-Mode: C-*-
  * "$Id: printrcl.l,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
  *
@@ -697,21 +621,7 @@ q_strdup(const char *s)
     return g_strndup(s + 1, strlen(s) - 2);
 }
 
-#line 701 "printrcl.c"
-
-#define INITIAL 0
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include 
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
+#line 625 "printrcl.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -719,30 +629,65 @@ q_strdup(const char *s)
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap YY_PROTO(( void ));
 #else
-extern int yywrap (void );
+extern int yywrap YY_PROTO(( void ));
 #endif
 #endif
 
-    static void yyunput (int c,char *buf_ptr  );
-    
+#ifndef YY_NO_UNPUT
+static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+#endif
+
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput YY_PROTO(( void ));
 #else
-static int input (void );
+static int input YY_PROTO(( void ));
+#endif
+#endif
+
+#if YY_STACK_USED
+static int yy_start_stack_ptr = 0;
+static int yy_start_stack_depth = 0;
+static int *yy_start_stack = 0;
+#ifndef YY_NO_PUSH_STATE
+static void yy_push_state YY_PROTO(( int new_state ));
+#endif
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state YY_PROTO(( void ));
+#endif
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state YY_PROTO(( void ));
 #endif
 
+#else
+#define YY_NO_PUSH_STATE 1
+#define YY_NO_POP_STATE 1
+#define YY_NO_TOP_STATE 1
+#endif
+
+#ifdef YY_MALLOC_DECL
+YY_MALLOC_DECL
+#else
+#if __STDC__
+#ifndef __cplusplus
+#include 
+#endif
+#else
+/* Just try to get by without declaring the routines.  This will fail
+ * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
+ * or sizeof(void*) != sizeof(int).
+ */
+#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */
@@ -751,6 +696,7 @@ static int input (void );
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
+
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
@@ -763,10 +709,9 @@ static int input (void );
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+	if ( yy_current_buffer->yy_is_interactive ) \
 		{ \
-		int c = '*'; \
-		size_t n; \
+		int c = '*', n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -776,22 +721,9 @@ static int input (void );
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
+	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+		  && ferror( yyin ) ) \
+		YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -812,18 +744,12 @@ static int input (void );
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
-/* end tables serialization structures and prototypes */
-
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
+#define YY_DECL int yylex YY_PROTO(( void ))
+#endif
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -840,29 +766,27 @@ extern int yylex (void);
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
-/** The main scanner function which does all the work.
- */
 YY_DECL
-{
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-    
+
 #line 73 "printrcl.l"
 
 
-#line 855 "printrcl.c"
+#line 779 "printrcl.c"
 
-	if ( (yy_init) )
+	if ( yy_init )
 		{
-		(yy_init) = 0;
+		yy_init = 0;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
+		if ( ! yy_start )
+			yy_start = 1;	/* first start state */
 
 		if ( ! yyin )
 			yyin = stdin;
@@ -870,36 +794,34 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
+		if ( ! yy_current_buffer )
+			yy_current_buffer =
+				yy_create_buffer( yyin, YY_BUF_SIZE );
 
-		yy_load_buffer_state( );
+		yy_load_buffer_state();
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = (yy_c_buf_p);
+		yy_cp = yy_c_buf_p;
 
 		/* Support of yytext. */
-		*yy_cp = (yy_hold_char);
+		*yy_cp = yy_hold_char;
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = (yy_start);
+		yy_current_state = yy_start;
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
+				yy_last_accepting_state = yy_current_state;
+				yy_last_accepting_cpos = yy_cp;
 				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
@@ -916,22 +838,24 @@ yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
+			yy_cp = yy_last_accepting_cpos;
+			yy_current_state = yy_last_accepting_state;
 			yy_act = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
+
 do_action:	/* This label is used only to access EOF actions. */
 
+
 		switch ( yy_act )
 	{ /* beginning of action switch */
 			case 0: /* must back up */
 			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
+			*yy_cp = yy_hold_char;
+			yy_cp = yy_last_accepting_cpos;
+			yy_current_state = yy_last_accepting_state;
 			goto yy_find_action;
 
 case 1:
@@ -1095,7 +1019,6 @@ YY_RULE_SETUP
 yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 33:
-/* rule 33 can match eol */
 YY_RULE_SETUP
 #line 109 "printrcl.l"
 yylval.sval = q_strdup(yytext); DBG(tSTRING); return tSTRING;
@@ -1111,7 +1034,6 @@ YY_RULE_SETUP
 yylval.sval = g_strdup(yytext); DBG(tWORD); return tWORD;
 	YY_BREAK
 case 36:
-/* rule 36 can match eol */
 YY_RULE_SETUP
 #line 112 "printrcl.l"
 DBG(PRINTRC_HDR); return PRINTRC_HDR;
@@ -1127,7 +1049,6 @@ YY_RULE_SETUP
 DBG(comment1); 	/* Skip comments */
 	YY_BREAK
 case 39:
-/* rule 39 can match eol */
 YY_RULE_SETUP
 #line 115 "printrcl.l"
 DBG(newline); mylineno++;
@@ -1137,33 +1058,33 @@ YY_RULE_SETUP
 #line 116 "printrcl.l"
 ECHO;
 	YY_BREAK
-#line 1141 "printrcl.c"
+#line 1062 "printrcl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
+		*yy_cp = yy_hold_char;
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
 			 * just pointed yyin at a new source and called
 			 * yylex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
+			 * consistency between yy_current_buffer and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			yy_n_chars = yy_current_buffer->yy_n_chars;
+			yy_current_buffer->yy_input_file = yyin;
+			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1173,13 +1094,13 @@ case YY_STATE_EOF(INITIAL):
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state(  );
+			yy_current_state = yy_get_previous_state();
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -1192,30 +1113,30 @@ case YY_STATE_EOF(INITIAL):
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+			yy_bp = yytext_ptr + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
+				yy_cp = ++yy_c_buf_p;
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = (yy_c_buf_p);
+				yy_cp = yy_c_buf_p;
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer(  ) )
+		else switch ( yy_get_next_buffer() )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				(yy_did_buffer_switch_on_eof) = 0;
+				yy_did_buffer_switch_on_eof = 0;
 
-				if ( yywrap( ) )
+				if ( yywrap() )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
@@ -1226,7 +1147,7 @@ case YY_STATE_EOF(INITIAL):
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -1234,30 +1155,30 @@ case YY_STATE_EOF(INITIAL):
 
 				else
 					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
+					if ( ! yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
+				yy_c_buf_p =
+					yytext_ptr + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state(  );
+				yy_current_state = yy_get_previous_state();
 
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				yy_cp = yy_c_buf_p;
+				yy_bp = yytext_ptr + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+				yy_c_buf_p =
+				&yy_current_buffer->yy_ch_buf[yy_n_chars];
 
-				yy_current_state = yy_get_previous_state(  );
+				yy_current_state = yy_get_previous_state();
 
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				yy_cp = yy_c_buf_p;
+				yy_bp = yytext_ptr + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -1268,7 +1189,8 @@ case YY_STATE_EOF(INITIAL):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-} /* end of yylex */
+	} /* end of yylex */
+
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1277,20 +1199,21 @@ case YY_STATE_EOF(INITIAL):
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-static int yy_get_next_buffer (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
+
+static int yy_get_next_buffer()
+	{
+	register char *dest = yy_current_buffer->yy_ch_buf;
+	register char *source = yytext_ptr;
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+	if ( yy_current_buffer->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -1310,30 +1233,34 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
 
 	else
 		{
-			size_t num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+		int num_to_read =
+			yy_current_buffer->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
+#ifdef YY_USES_REJECT
+			YY_FATAL_ERROR(
+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+#else
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+			YY_BUFFER_STATE b = yy_current_buffer;
 
 			int yy_c_buf_p_offset =
-				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+				(int) (yy_c_buf_p - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
@@ -1346,7 +1273,8 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yy_flex_realloc( (void *) b->yy_ch_buf,
+							 b->yy_buf_size + 2 );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1356,35 +1284,35 @@ static int yy_get_next_buffer (void)
 				YY_FATAL_ERROR(
 				"fatal error - scanner input buffer overflow" );
 
-			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+			num_to_read = yy_current_buffer->yy_buf_size -
 						number_to_move - 1;
-
+#endif
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
+			yy_n_chars, num_to_read );
 
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		yy_current_buffer->yy_n_chars = yy_n_chars;
 		}
 
-	if ( (yy_n_chars) == 0 )
+	if ( yy_n_chars == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart(yyin  );
+			yyrestart( yyin );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+			yy_current_buffer->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1392,31 +1320,32 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+	yy_n_chars += number_to_move;
+	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
 
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
 
 	return ret_val;
-}
+	}
+
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-    static yy_state_type yy_get_previous_state (void)
-{
+static yy_state_type yy_get_previous_state()
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
 
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+	yy_current_state = yy_start;
+
+	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
-			(yy_last_accepting_state) = yy_current_state;
-			(yy_last_accepting_cpos) = yy_cp;
+			yy_last_accepting_state = yy_current_state;
+			yy_last_accepting_cpos = yy_cp;
 			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
@@ -1428,23 +1357,30 @@ static int yy_get_next_buffer (void)
 		}
 
 	return yy_current_state;
-}
+	}
+
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
+
+#ifdef YY_USE_PROTOS
+static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
+#else
+static yy_state_type yy_try_NUL_trans( yy_current_state )
+yy_state_type yy_current_state;
+#endif
+	{
 	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
+	register char *yy_cp = yy_c_buf_p;
 
 	register YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
-		(yy_last_accepting_state) = yy_current_state;
-		(yy_last_accepting_cpos) = yy_cp;
+		yy_last_accepting_state = yy_current_state;
+		yy_last_accepting_cpos = yy_cp;
 		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
@@ -1456,73 +1392,80 @@ static int yy_get_next_buffer (void)
 	yy_is_jam = (yy_current_state == 334);
 
 	return yy_is_jam ? 0 : yy_current_state;
-}
+	}
 
-    static void yyunput (int c, register char * yy_bp )
-{
-	register char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
+
+#ifndef YY_NO_UNPUT
+#ifdef YY_USE_PROTOS
+static void yyunput( int c, register char *yy_bp )
+#else
+static void yyunput( c, yy_bp )
+int c;
+register char *yy_bp;
+#endif
+	{
+	register char *yy_cp = yy_c_buf_p;
 
 	/* undo effects of setting up yytext */
-	*yy_cp = (yy_hold_char);
+	*yy_cp = yy_hold_char;
 
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = (yy_n_chars) + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register int number_to_move = yy_n_chars + 2;
+		register char *dest = &yy_current_buffer->yy_ch_buf[
+					yy_current_buffer->yy_buf_size + 2];
 		register char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+				&yy_current_buffer->yy_ch_buf[number_to_move];
 
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+		while ( source > yy_current_buffer->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+		yy_current_buffer->yy_n_chars =
+			yy_n_chars = yy_current_buffer->yy_buf_size;
 
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
-	(yytext_ptr) = yy_bp;
-	(yy_hold_char) = *yy_cp;
-	(yy_c_buf_p) = yy_cp;
-}
 
-#ifndef YY_NO_INPUT
+	yytext_ptr = yy_bp;
+	yy_hold_char = *yy_cp;
+	yy_c_buf_p = yy_cp;
+	}
+#endif	/* ifndef YY_NO_UNPUT */
+
+
 #ifdef __cplusplus
-    static int yyinput (void)
+static int yyinput()
 #else
-    static int input  (void)
+static int input()
 #endif
-
-{
+	{
 	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+	*yy_c_buf_p = yy_hold_char;
+
+	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
 			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
+			*yy_c_buf_p = '\0';
 
 		else
 			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
+			int offset = yy_c_buf_p - yytext_ptr;
+			++yy_c_buf_p;
 
-			switch ( yy_get_next_buffer(  ) )
+			switch ( yy_get_next_buffer() )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -1536,16 +1479,16 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					yyrestart(yyin );
+					yyrestart( yyin );
 
-					/*FALLTHROUGH*/
+					/* fall through */
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap( ) )
+					if ( yywrap() )
 						return EOF;
 
-					if ( ! (yy_did_buffer_switch_on_eof) )
+					if ( ! yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -1555,92 +1498,90 @@ static int yy_get_next_buffer (void)
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
+					yy_c_buf_p = yytext_ptr + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve yytext */
-	(yy_hold_char) = *++(yy_c_buf_p);
+	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
+	*yy_c_buf_p = '\0';	/* preserve yytext */
+	yy_hold_char = *++yy_c_buf_p;
+
 
 	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
+	}
 
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void yyrestart  (FILE * input_file )
-{
-    
-	if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
+
+#ifdef YY_USE_PROTOS
+void yyrestart( FILE *input_file )
+#else
+void yyrestart( input_file )
+FILE *input_file;
+#endif
+	{
+	if ( ! yy_current_buffer )
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+
+	yy_init_buffer( yy_current_buffer, input_file );
+	yy_load_buffer_state();
 	}
 
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
 
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-    
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
-     */
-	yyensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
+#ifdef YY_USE_PROTOS
+void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
+#else
+void yy_switch_to_buffer( new_buffer )
+YY_BUFFER_STATE new_buffer;
+#endif
+	{
+	if ( yy_current_buffer == new_buffer )
 		return;
 
-	if ( YY_CURRENT_BUFFER )
+	if ( yy_current_buffer )
 		{
 		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		*yy_c_buf_p = yy_hold_char;
+		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
+		yy_current_buffer->yy_n_chars = yy_n_chars;
 		}
 
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
+	yy_current_buffer = new_buffer;
+	yy_load_buffer_state();
 
 	/* We don't actually know whether we did this switch during
 	 * EOF (yywrap()) processing, but the only time this flag
 	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
+	yy_did_buffer_switch_on_eof = 1;
+	}
 
-static void yy_load_buffer_state  (void)
-{
-    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
 
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
-{
+#ifdef YY_USE_PROTOS
+void yy_load_buffer_state( void )
+#else
+void yy_load_buffer_state()
+#endif
+	{
+	yy_n_chars = yy_current_buffer->yy_n_chars;
+	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
+	yyin = yy_current_buffer->yy_input_file;
+	yy_hold_char = *yy_c_buf_p;
+	}
+
+
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
+#else
+YY_BUFFER_STATE yy_create_buffer( file, size )
+FILE *file;
+int size;
+#endif
+	{
 	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1649,75 +1590,80 @@ static void yy_load_buffer_state  (void)
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer(b,file );
+	yy_init_buffer( b, file );
 
 	return b;
-}
+	}
 
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
+
+#ifdef YY_USE_PROTOS
+void yy_delete_buffer( YY_BUFFER_STATE b )
+#else
+void yy_delete_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+	{
 	if ( ! b )
 		return;
 
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+	if ( b == yy_current_buffer )
+		yy_current_buffer = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
+		yy_flex_free( (void *) b->yy_ch_buf );
 
-	yyfree((void *) b  );
-}
+	yy_flex_free( (void *) b );
+	}
 
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-{
-	int oerrno = errno;
-    
-	yy_flush_buffer(b );
+#ifndef YY_ALWAYS_INTERACTIVE
+#ifndef YY_NEVER_INTERACTIVE
+extern int isatty YY_PROTO(( int ));
+#endif
+#endif
+
+#ifdef YY_USE_PROTOS
+void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
+#else
+void yy_init_buffer( b, file )
+YY_BUFFER_STATE b;
+FILE *file;
+#endif
+
+
+	{
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-	errno = oerrno;
-}
+#if YY_ALWAYS_INTERACTIVE
+	b->yy_is_interactive = 1;
+#else
+#if YY_NEVER_INTERACTIVE
+	b->yy_is_interactive = 0;
+#else
+	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+#endif
+#endif
+	}
 
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
-{
-    	if ( ! b )
+
+#ifdef YY_USE_PROTOS
+void yy_flush_buffer( YY_BUFFER_STATE b )
+#else
+void yy_flush_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+
+	{
+	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1734,121 +1680,29 @@ extern int isatty (int );
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-    	if (new_buffer == NULL)
-		return;
-
-	yyensure_buffer_stack();
-
-	/* This block is copied from yy_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-void yypop_buffer_state (void)
-{
-    	if (!YY_CURRENT_BUFFER)
-		return;
-
-	yy_delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
-	int num_to_alloc;
-    
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
+	if ( b == yy_current_buffer )
+		yy_load_buffer_state();
 	}
 
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
 
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
-{
+#ifndef YY_NO_SCAN_BUFFER
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
+#else
+YY_BUFFER_STATE yy_scan_buffer( base, size )
+char *base;
+yy_size_t size;
+#endif
+	{
 	YY_BUFFER_STATE b;
-    
+
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -1862,42 +1716,47 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer(b  );
+	yy_switch_to_buffer( b );
 
 	return b;
-}
+	}
+#endif
 
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
-{
-    
-	return yy_scan_bytes(yy_str,strlen(yy_str) );
-}
 
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
-{
+#ifndef YY_NO_SCAN_STRING
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
+#else
+YY_BUFFER_STATE yy_scan_string( yy_str )
+yyconst char *yy_str;
+#endif
+	{
+	int len;
+	for ( len = 0; yy_str[len]; ++len )
+		;
+
+	return yy_scan_bytes( yy_str, len );
+	}
+#endif
+
+
+#ifndef YY_NO_SCAN_BYTES
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
+#else
+YY_BUFFER_STATE yy_scan_bytes( bytes, len )
+yyconst char *bytes;
+int len;
+#endif
+	{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-    
+
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = len + 2;
-	buf = (char *) yyalloc(n  );
+	buf = (char *) yy_flex_alloc( n );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -1906,7 +1765,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
 
 	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer(buf,n );
+	b = yy_scan_buffer( buf, n );
 	if ( ! b )
 		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
@@ -1916,164 +1775,148 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
 	b->yy_is_our_buffer = 1;
 
 	return b;
-}
+	}
+#endif
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
+
+#ifndef YY_NO_PUSH_STATE
+#ifdef YY_USE_PROTOS
+static void yy_push_state( int new_state )
+#else
+static void yy_push_state( new_state )
+int new_state;
 #endif
+	{
+	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+		{
+		yy_size_t new_size;
 
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
+		yy_start_stack_depth += YY_START_STACK_INCR;
+		new_size = yy_start_stack_depth * sizeof( int );
 
-/* Redefine yyless() so it works in section 3 code. */
+		if ( ! yy_start_stack )
+			yy_start_stack = (int *) yy_flex_alloc( new_size );
 
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = (yy_hold_char); \
-		(yy_c_buf_p) = yytext + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
+		else
+			yy_start_stack = (int *) yy_flex_realloc(
+					(void *) yy_start_stack, new_size );
 
-/* Accessor  methods (get/set functions) to struct members. */
+		if ( ! yy_start_stack )
+			YY_FATAL_ERROR(
+			"out of memory expanding start-condition stack" );
+		}
 
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
+	yy_start_stack[yy_start_stack_ptr++] = YY_START;
 
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
+	BEGIN(new_state);
+	}
+#endif
 
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
 
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state()
+	{
+	if ( --yy_start_stack_ptr < 0 )
+		YY_FATAL_ERROR( "start-condition stack underflow" );
 
-/** Get the current token.
- * 
- */
+	BEGIN(yy_start_stack[yy_start_stack_ptr]);
+	}
+#endif
 
-char *yyget_text  (void)
-{
-        return yytext;
-}
 
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state()
+	{
+	return yy_start_stack[yy_start_stack_ptr - 1];
+	}
+#endif
 
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  in_str )
-{
-        yyin = in_str ;
-}
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
 
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_str ;
-}
+#ifdef YY_USE_PROTOS
+static void yy_fatal_error( yyconst char msg[] )
+#else
+static void yy_fatal_error( msg )
+char msg[];
+#endif
+	{
+	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+	}
 
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
 
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
 
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer(YY_CURRENT_BUFFER  );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state();
-	}
+/* Redefine yyless() so it works in section 3 code. */
 
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+		yytext[yyleng] = yy_hold_char; \
+		yy_c_buf_p = yytext + n; \
+		yy_hold_char = *yy_c_buf_p; \
+		*yy_c_buf_p = '\0'; \
+		yyleng = n; \
+		} \
+	while ( 0 )
 
-    return 0;
-}
 
-/*
- * Internal utility routines.
- */
+/* Internal utility routines. */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
+#ifdef YY_USE_PROTOS
+static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
+#else
+static void yy_flex_strncpy( s1, s2, n )
+char *s1;
+yyconst char *s2;
+int n;
+#endif
+	{
 	register int i;
-    	for ( i = 0; i < n; ++i )
+	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-}
+	}
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
+#ifdef YY_USE_PROTOS
+static int yy_flex_strlen( yyconst char *s )
+#else
+static int yy_flex_strlen( s )
+yyconst char *s;
+#endif
+	{
 	register int n;
-    	for ( n = 0; s[n]; ++n )
+	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-}
+	}
 #endif
 
-void *yyalloc (yy_size_t  size )
-{
+
+#ifdef YY_USE_PROTOS
+static void *yy_flex_alloc( yy_size_t size )
+#else
+static void *yy_flex_alloc( size )
+yy_size_t size;
+#endif
+	{
 	return (void *) malloc( size );
-}
+	}
 
-void *yyrealloc  (void * ptr, yy_size_t  size )
-{
+#ifdef YY_USE_PROTOS
+static void *yy_flex_realloc( void *ptr, yy_size_t size )
+#else
+static void *yy_flex_realloc( ptr, size )
+void *ptr;
+yy_size_t size;
+#endif
+	{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -2082,25 +1925,23 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
+	}
 
-#undef YY_NEW_FILE
-#undef YY_FLUSH_BUFFER
-#undef yy_set_bol
-#undef yy_new_buffer
-#undef yy_set_interactive
-#undef yytext_ptr
-#undef YY_DO_BEFORE_ACTION
+#ifdef YY_USE_PROTOS
+static void yy_flex_free( void *ptr )
+#else
+static void yy_flex_free( ptr )
+void *ptr;
+#endif
+	{
+	free( ptr );
+	}
 
-#ifdef YY_DECL_IS_OURS
-#undef YY_DECL_IS_OURS
-#undef YY_DECL
+#if YY_MAIN
+int main()
+	{
+	yylex();
+	return 0;
+	}
 #endif
 #line 116 "printrcl.l"
diff --git a/src/gutenprintui/printrcy.c b/src/gutenprintui/printrcy.c
index 95f3d4c..1609566 100644
--- a/src/gutenprintui/printrcy.c
+++ b/src/gutenprintui/printrcy.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -196,29 +196,22 @@ typedef int YYSTYPE;
 
 
 /* Line 214 of yacc.c.  */
-#line 200 "printrcy.c"
+#line 199 "printrcy.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
-# ifndef YYFREE
-#  define YYFREE free
-# endif
-# ifndef YYMALLOC
-#  define YYMALLOC malloc
-# endif
-
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   define YYSTACK_ALLOC alloca
-#  endif
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
 # else
-#  if defined (alloca) || defined (_ALLOCA_H)
-#   define YYSTACK_ALLOC alloca
-#  else
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
 #   endif
 #  endif
 # endif
@@ -231,20 +224,20 @@ typedef int YYSTYPE;
 #   include  /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T size_t
 #  endif
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+	 || (YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  short yyss;
   YYSTYPE yyvs;
   };
 
@@ -254,13 +247,13 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
@@ -296,7 +289,7 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short int yysigned_char;
+   typedef short yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
@@ -396,7 +389,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const unsigned short yyrline[] =
 {
        0,   100,   100,   111,   118,   128,   138,   148,   158,   164,
      168,   172,   176,   180,   184,   188,   206,   210,   214,   217,
@@ -414,32 +407,32 @@ static const unsigned short int yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION",
-  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER",
-  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING",
-  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP",
-  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR",
-  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS",
-  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL",
-  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE",
-  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination",
-  "Queue_Name", "Output_Filename", "Extra_Printer_Options",
-  "Custom_Command", "Command_Type", "Scaling", "Orientation",
-  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type",
-  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param",
-  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param",
-  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", "Parameters",
-  "Standard_Value", "Standard_Values", "A_Printer", "Printers",
-  "Current_Printer", "Show_All_Paper_Sizes", "Global", "Old_Globals",
-  "New_Global_Setting", "Global_Setting", "Global_Settings",
-  "Global_Subblock", "Global_Block", "Thing", 0
+  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION", 
+  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER", 
+  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING", 
+  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP", 
+  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR", 
+  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS", 
+  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL", 
+  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE", 
+  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination", 
+  "Queue_Name", "Output_Filename", "Extra_Printer_Options", 
+  "Custom_Command", "Command_Type", "Scaling", "Orientation", 
+  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type", 
+  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param", 
+  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param", 
+  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", 
+  "Parameters", "Standard_Value", "Standard_Values", "A_Printer", 
+  "Printers", "Current_Printer", "Show_All_Paper_Sizes", "Global", 
+  "Old_Globals", "New_Global_Setting", "Global_Setting", 
+  "Global_Settings", "Global_Subblock", "Global_Block", "Thing", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
+static const unsigned short yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -603,8 +596,7 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
+#define YYERROR		goto yyerrlab1
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -638,11 +630,11 @@ while (0)
    are run).  */
 
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)		\
-   ((Current).first_line   = (Rhs)[1].first_line,	\
-    (Current).first_column = (Rhs)[1].first_column,	\
-    (Current).last_line    = (Rhs)[N].last_line,	\
-    (Current).last_column  = (Rhs)[N].last_column)
+# define YYLLOC_DEFAULT(Current, Rhs, N)         \
+  Current.first_line   = Rhs[1].first_line;      \
+  Current.first_column = Rhs[1].first_column;    \
+  Current.last_line    = Rhs[N].last_line;       \
+  Current.last_column  = Rhs[N].last_column;
 #endif
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
@@ -686,17 +678,17 @@ do {								\
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
+| TOP (cinluded).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (short *bottom, short *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+    short *bottom;
+    short *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -726,9 +718,9 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned int yylno = yyrline[yyrule];
+  unsigned int yylineno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylno);
+             yyrule - 1, yylineno);
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
     YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
@@ -765,7 +757,7 @@ int yydebug;
    SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+#if YYMAXDEPTH == 0
 # undef YYMAXDEPTH
 #endif
 
@@ -963,9 +955,9 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  register short int *yyssp;
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
@@ -1002,7 +994,6 @@ yyparse ()
   yyssp = yyss;
   yyvsp = yyvs;
 
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1028,7 +1019,7 @@ yyparse ()
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
@@ -1056,7 +1047,7 @@ yyparse ()
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
@@ -1463,8 +1454,8 @@ yyreduce:
 
     }
 
-/* Line 1010 of yacc.c.  */
-#line 1468 "printrcy.c"
+/* Line 991 of yacc.c.  */
+#line 1458 "printrcy.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1505,33 +1496,18 @@ yyerrlab:
 	{
 	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
-	  const char* yyprefix;
 	  char *yymsg;
-	  int yyx;
+	  int yyx, yycount;
 
+	  yycount = 0;
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 0;
-
-	  yyprefix = ", expecting ";
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-		yycount += 1;
-		if (yycount == 5)
-		  {
-		    yysize = 0;
-		    break;
-		  }
-	      }
-	  yysize += (sizeof ("syntax error, unexpected ")
-		     + yystrlen (yytname[yytype]));
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("syntax error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[yytype]);
 	  yymsg = (char *) YYSTACK_ALLOC (yysize);
 	  if (yymsg != 0)
 	    {
@@ -1540,13 +1516,16 @@ yyerrlab:
 
 	      if (yycount < 5)
 		{
-		  yyprefix = ", expecting ";
-		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+		  yycount = 0;
+		  for (yyx = yyn < 0 ? -yyn : 0;
+		       yyx < (int) (sizeof (yytname) / sizeof (char *));
+		       yyx++)
 		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		      {
-			yyp = yystpcpy (yyp, yyprefix);
+			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyq);
 			yyp = yystpcpy (yyp, yytname[yyx]);
-			yyprefix = " or ";
+			yycount++;
 		      }
 		}
 	      yyerror (yymsg);
@@ -1567,56 +1546,52 @@ yyerrlab:
       /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      if (yychar <= YYEOF)
+      /* Return failure if at end of input.  */
+      if (yychar == YYEOF)
         {
-          /* If at end of input, pop the error token,
-	     then the rest of the stack, then return failure.  */
-	  if (yychar == YYEOF)
-	     for (;;)
-	       {
-		 YYPOPSTACK;
-		 if (yyssp == yyss)
-		   YYABORT;
-		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-		 yydestruct (yystos[*yyssp], yyvsp);
-	       }
+	  /* Pop the error token.  */
+          YYPOPSTACK;
+	  /* Pop the rest of the stack.  */
+	  while (yyss < yyssp)
+	    {
+	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+	      yydestruct (yystos[*yyssp], yyvsp);
+	      YYPOPSTACK;
+	    }
+	  YYABORT;
         }
-      else
-	{
-	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-	  yydestruct (yytoken, &yylval);
-	  yychar = YYEMPTY;
 
-	}
+      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+      yydestruct (yytoken, &yylval);
+      yychar = YYEMPTY;
+
     }
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
-  goto yyerrlab1;
+  goto yyerrlab2;
 
 
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
+/*----------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action.  |
+`----------------------------------------------------*/
+yyerrlab1:
 
-#ifdef __GNUC__
-  /* Pacify GCC when the user code never invokes YYERROR and the label
-     yyerrorlab therefore never appears in user code.  */
-  if (0)
-     goto yyerrorlab;
+  /* Suppress GCC warning that yyerrlab1 is unused when no action
+     invokes YYERROR.  */
+#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \
+    && !defined __cplusplus
+  __attribute__ ((__unused__))
 #endif
 
-  yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
 
+  goto yyerrlab2;
 
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
+
+/*---------------------------------------------------------------.
+| yyerrlab2 -- pop states until the error token can be shifted.  |
+`---------------------------------------------------------------*/
+yyerrlab2:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1639,8 +1614,9 @@ yyerrlab1:
 
       YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
       yydestruct (yystos[yystate], yyvsp);
-      YYPOPSTACK;
-      yystate = *yyssp;
+      yyvsp--;
+      yystate = *--yyssp;
+
       YY_STACK_PRINT (yyss, yyssp);
     }
 
diff --git a/src/gutenprintui/printrcy.h b/src/gutenprintui/printrcy.h
index 2273fb7..afa662b 100644
--- a/src/gutenprintui/printrcy.h
+++ b/src/gutenprintui/printrcy.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 8c3e85c..3a43db9 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -298,7 +298,6 @@ 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@
diff --git a/src/gutenprintui2/printrcl.c b/src/gutenprintui2/printrcl.c
index 6d6cd19..1c4d8e1 100644
--- a/src/gutenprintui2/printrcl.c
+++ b/src/gutenprintui2/printrcl.c
@@ -1,85 +1,32 @@
-
-#line 3 "printrcl.c"
-
-#define  YY_INT_ALIGNED short int
-
 /* A lexical scanner generated by flex */
 
+/* Scanner skeleton version:
+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ */
+
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 31
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
 
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
 #include 
-#include 
-#include 
-#include 
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
 
-/* C99 systems have . Non-C99 systems may or may not. */
 
-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#include 
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
 #endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
 
+#include 
+#include 
+
+/* Use prototypes in function declarations. */
+#define YY_USE_PROTOS
+
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
@@ -87,17 +34,34 @@ typedef unsigned int flex_uint32_t;
 
 #if __STDC__
 
+#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
+#ifdef __TURBOC__
+ #pragma warn -rch
+ #pragma warn -use
+#include 
+#include 
+#define YY_USE_CONST
+#define YY_USE_PROTOS
+#endif
+
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
+
+#ifdef YY_USE_PROTOS
+#define YY_PROTO(proto) proto
+#else
+#define YY_PROTO(proto) ()
+#endif
+
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -112,71 +76,71 @@ typedef unsigned int flex_uint32_t;
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN (yy_start) = 1 + 2 *
+#define BEGIN yy_start = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START (((yy_start) - 1) / 2)
+#define YY_START ((yy_start - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
+#define YY_NEW_FILE yyrestart( yyin )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
-#endif
 
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
 
 extern int yyleng;
-
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
+/* The funky do-while in the following #define is used to turn the definition
+ * int a single C statement (which needs a semi-colon terminator).  This
+ * avoids problems with code like:
+ *
+ * 	if ( condition_holds )
+ *		yyless( 5 );
+ *	else
+ *		do_something_else();
+ *
+ * Prior to using the do-while the compiler would get upset at the
+ * "else" because it interpreted the "if" statement as being all
+ * done when it reached the ';' after the yyless() call.
+ */
+
+/* Return all but the first 'n' matched characters back to the input stream. */
+
 #define yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
+		*yy_cp = yy_hold_char; \
 		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, (yytext_ptr)  )
+#define unput(c) yyunput( c, yytext_ptr )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
 typedef unsigned int yy_size_t;
-#endif
 
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
+
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -213,16 +177,12 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
-
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -236,33 +196,23 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-
 	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE yy_current_buffer = 0;
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
- *
- * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
+#define YY_CURRENT_BUFFER yy_current_buffer
 
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
+
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+
+
 int yyleng;
 
 /* Points to current character in buffer. */
@@ -275,93 +225,69 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+void yyrestart YY_PROTO(( FILE *input_file ));
 
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
+void yy_load_buffer_state YY_PROTO(( void ));
+YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
+void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
+void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
 
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
+YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
+YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
+YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
 
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
+static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
 
-#define yywrap(n) 1
-#define YY_SKIP_YYWRAP
 
+#define yywrap() 1
+#define YY_SKIP_YYWRAP
 typedef unsigned char YY_CHAR;
-
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
 typedef int yy_state_type;
-
-extern int yylineno;
-
-int yylineno = 1;
-
 extern char *yytext;
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
+static yy_state_type yy_get_previous_state YY_PROTO(( void ));
+static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
+static int yy_get_next_buffer YY_PROTO(( void ));
+static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
+	yytext_ptr = yy_bp; \
+	yyleng = (int) (yy_cp - yy_bp); \
+	yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
+	yy_c_buf_p = yy_cp;
 
 #define YY_NUM_RULES 40
 #define YY_END_OF_BUFFER 41
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept[335] =
+static yyconst short int yy_accept[335] =
     {   0,
         0,    0,   41,   40,   37,   39,   40,   38,   40,   40,
        31,   35,   35,   35,   35,   35,   35,   35,   35,   35,
@@ -402,7 +328,7 @@ static yyconst flex_int16_t yy_accept[335] =
         0,    2,   18,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -434,7 +360,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[39] =
+static yyconst int yy_meta[39] =
     {   0,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    3,
         3,    1,    3,    3,    3,    3,    3,    3,    3,    3,
@@ -442,7 +368,7 @@ static yyconst flex_int32_t yy_meta[39] =
         3,    3,    3,    3,    3,    3,    3,    3
     } ;
 
-static yyconst flex_int16_t yy_base[340] =
+static yyconst short int yy_base[340] =
     {   0,
         0,    0,  374,  375,  371,  375,  368,  343,  364,   29,
        32,  336,  341,   18,   26,   21,   32,  343,    0,  340,
@@ -483,7 +409,7 @@ static yyconst flex_int16_t yy_base[340] =
        81,  375,  375,  375,   94,   97,  100,   89,  103
     } ;
 
-static yyconst flex_int16_t yy_def[340] =
+static yyconst short int yy_def[340] =
     {   0,
       334,    1,  334,  334,  334,  334,  335,  336,  337,  334,
       334,  338,  338,  338,  338,  338,  338,  338,  338,  338,
@@ -524,7 +450,7 @@ static yyconst flex_int16_t yy_def[340] =
       334,  334,  334,    0,  334,  334,  334,  334,  334
     } ;
 
-static yyconst flex_int16_t yy_nxt[414] =
+static yyconst short int yy_nxt[414] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        11,    4,    4,   12,   13,   14,   15,   16,   17,   18,
@@ -574,7 +500,7 @@ static yyconst flex_int16_t yy_nxt[414] =
       334,  334,  334
     } ;
 
-static yyconst flex_int16_t yy_chk[414] =
+static yyconst short int yy_chk[414] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -627,9 +553,6 @@ static yyconst flex_int16_t yy_chk[414] =
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
  */
@@ -639,6 +562,7 @@ int yy_flex_debug = 0;
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "printrcl.l"
+#define INITIAL 0
 /*		-*-Mode: C-*-
  * "$Id: printrcl.l,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
  *
@@ -697,21 +621,7 @@ q_strdup(const char *s)
     return g_strndup(s + 1, strlen(s) - 2);
 }
 
-#line 701 "printrcl.c"
-
-#define INITIAL 0
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include 
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
+#line 625 "printrcl.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -719,30 +629,65 @@ q_strdup(const char *s)
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap YY_PROTO(( void ));
 #else
-extern int yywrap (void );
+extern int yywrap YY_PROTO(( void ));
 #endif
 #endif
 
-    static void yyunput (int c,char *buf_ptr  );
-    
+#ifndef YY_NO_UNPUT
+static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+#endif
+
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput YY_PROTO(( void ));
 #else
-static int input (void );
+static int input YY_PROTO(( void ));
+#endif
+#endif
+
+#if YY_STACK_USED
+static int yy_start_stack_ptr = 0;
+static int yy_start_stack_depth = 0;
+static int *yy_start_stack = 0;
+#ifndef YY_NO_PUSH_STATE
+static void yy_push_state YY_PROTO(( int new_state ));
+#endif
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state YY_PROTO(( void ));
+#endif
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state YY_PROTO(( void ));
 #endif
 
+#else
+#define YY_NO_PUSH_STATE 1
+#define YY_NO_POP_STATE 1
+#define YY_NO_TOP_STATE 1
+#endif
+
+#ifdef YY_MALLOC_DECL
+YY_MALLOC_DECL
+#else
+#if __STDC__
+#ifndef __cplusplus
+#include 
+#endif
+#else
+/* Just try to get by without declaring the routines.  This will fail
+ * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
+ * or sizeof(void*) != sizeof(int).
+ */
+#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */
@@ -751,6 +696,7 @@ static int input (void );
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
+
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
@@ -763,10 +709,9 @@ static int input (void );
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+	if ( yy_current_buffer->yy_is_interactive ) \
 		{ \
-		int c = '*'; \
-		size_t n; \
+		int c = '*', n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -776,22 +721,9 @@ static int input (void );
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
+	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+		  && ferror( yyin ) ) \
+		YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -812,18 +744,12 @@ static int input (void );
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
-/* end tables serialization structures and prototypes */
-
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
+#define YY_DECL int yylex YY_PROTO(( void ))
+#endif
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -840,29 +766,27 @@ extern int yylex (void);
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
-/** The main scanner function which does all the work.
- */
 YY_DECL
-{
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-    
+
 #line 73 "printrcl.l"
 
 
-#line 855 "printrcl.c"
+#line 779 "printrcl.c"
 
-	if ( (yy_init) )
+	if ( yy_init )
 		{
-		(yy_init) = 0;
+		yy_init = 0;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
+		if ( ! yy_start )
+			yy_start = 1;	/* first start state */
 
 		if ( ! yyin )
 			yyin = stdin;
@@ -870,36 +794,34 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
+		if ( ! yy_current_buffer )
+			yy_current_buffer =
+				yy_create_buffer( yyin, YY_BUF_SIZE );
 
-		yy_load_buffer_state( );
+		yy_load_buffer_state();
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = (yy_c_buf_p);
+		yy_cp = yy_c_buf_p;
 
 		/* Support of yytext. */
-		*yy_cp = (yy_hold_char);
+		*yy_cp = yy_hold_char;
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = (yy_start);
+		yy_current_state = yy_start;
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
+				yy_last_accepting_state = yy_current_state;
+				yy_last_accepting_cpos = yy_cp;
 				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
@@ -916,22 +838,24 @@ yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
+			yy_cp = yy_last_accepting_cpos;
+			yy_current_state = yy_last_accepting_state;
 			yy_act = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
+
 do_action:	/* This label is used only to access EOF actions. */
 
+
 		switch ( yy_act )
 	{ /* beginning of action switch */
 			case 0: /* must back up */
 			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
+			*yy_cp = yy_hold_char;
+			yy_cp = yy_last_accepting_cpos;
+			yy_current_state = yy_last_accepting_state;
 			goto yy_find_action;
 
 case 1:
@@ -1095,7 +1019,6 @@ YY_RULE_SETUP
 yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 33:
-/* rule 33 can match eol */
 YY_RULE_SETUP
 #line 109 "printrcl.l"
 yylval.sval = q_strdup(yytext); DBG(tSTRING); return tSTRING;
@@ -1111,7 +1034,6 @@ YY_RULE_SETUP
 yylval.sval = g_strdup(yytext); DBG(tWORD); return tWORD;
 	YY_BREAK
 case 36:
-/* rule 36 can match eol */
 YY_RULE_SETUP
 #line 112 "printrcl.l"
 DBG(PRINTRC_HDR); return PRINTRC_HDR;
@@ -1127,7 +1049,6 @@ YY_RULE_SETUP
 DBG(comment1); 	/* Skip comments */
 	YY_BREAK
 case 39:
-/* rule 39 can match eol */
 YY_RULE_SETUP
 #line 115 "printrcl.l"
 DBG(newline); mylineno++;
@@ -1137,33 +1058,33 @@ YY_RULE_SETUP
 #line 116 "printrcl.l"
 ECHO;
 	YY_BREAK
-#line 1141 "printrcl.c"
+#line 1062 "printrcl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
+		*yy_cp = yy_hold_char;
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
 			 * just pointed yyin at a new source and called
 			 * yylex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
+			 * consistency between yy_current_buffer and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			yy_n_chars = yy_current_buffer->yy_n_chars;
+			yy_current_buffer->yy_input_file = yyin;
+			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1173,13 +1094,13 @@ case YY_STATE_EOF(INITIAL):
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state(  );
+			yy_current_state = yy_get_previous_state();
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -1192,30 +1113,30 @@ case YY_STATE_EOF(INITIAL):
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+			yy_bp = yytext_ptr + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
+				yy_cp = ++yy_c_buf_p;
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = (yy_c_buf_p);
+				yy_cp = yy_c_buf_p;
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer(  ) )
+		else switch ( yy_get_next_buffer() )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				(yy_did_buffer_switch_on_eof) = 0;
+				yy_did_buffer_switch_on_eof = 0;
 
-				if ( yywrap( ) )
+				if ( yywrap() )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
@@ -1226,7 +1147,7 @@ case YY_STATE_EOF(INITIAL):
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -1234,30 +1155,30 @@ case YY_STATE_EOF(INITIAL):
 
 				else
 					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
+					if ( ! yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
+				yy_c_buf_p =
+					yytext_ptr + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state(  );
+				yy_current_state = yy_get_previous_state();
 
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				yy_cp = yy_c_buf_p;
+				yy_bp = yytext_ptr + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+				yy_c_buf_p =
+				&yy_current_buffer->yy_ch_buf[yy_n_chars];
 
-				yy_current_state = yy_get_previous_state(  );
+				yy_current_state = yy_get_previous_state();
 
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				yy_cp = yy_c_buf_p;
+				yy_bp = yytext_ptr + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -1268,7 +1189,8 @@ case YY_STATE_EOF(INITIAL):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-} /* end of yylex */
+	} /* end of yylex */
+
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1277,20 +1199,21 @@ case YY_STATE_EOF(INITIAL):
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-static int yy_get_next_buffer (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
+
+static int yy_get_next_buffer()
+	{
+	register char *dest = yy_current_buffer->yy_ch_buf;
+	register char *source = yytext_ptr;
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+	if ( yy_current_buffer->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -1310,30 +1233,34 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
 
 	else
 		{
-			size_t num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+		int num_to_read =
+			yy_current_buffer->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
+#ifdef YY_USES_REJECT
+			YY_FATAL_ERROR(
+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+#else
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+			YY_BUFFER_STATE b = yy_current_buffer;
 
 			int yy_c_buf_p_offset =
-				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+				(int) (yy_c_buf_p - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
@@ -1346,7 +1273,8 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yy_flex_realloc( (void *) b->yy_ch_buf,
+							 b->yy_buf_size + 2 );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1356,35 +1284,35 @@ static int yy_get_next_buffer (void)
 				YY_FATAL_ERROR(
 				"fatal error - scanner input buffer overflow" );
 
-			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+			num_to_read = yy_current_buffer->yy_buf_size -
 						number_to_move - 1;
-
+#endif
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
+			yy_n_chars, num_to_read );
 
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		yy_current_buffer->yy_n_chars = yy_n_chars;
 		}
 
-	if ( (yy_n_chars) == 0 )
+	if ( yy_n_chars == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart(yyin  );
+			yyrestart( yyin );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+			yy_current_buffer->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1392,31 +1320,32 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+	yy_n_chars += number_to_move;
+	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
 
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
 
 	return ret_val;
-}
+	}
+
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-    static yy_state_type yy_get_previous_state (void)
-{
+static yy_state_type yy_get_previous_state()
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
 
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+	yy_current_state = yy_start;
+
+	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
-			(yy_last_accepting_state) = yy_current_state;
-			(yy_last_accepting_cpos) = yy_cp;
+			yy_last_accepting_state = yy_current_state;
+			yy_last_accepting_cpos = yy_cp;
 			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
@@ -1428,23 +1357,30 @@ static int yy_get_next_buffer (void)
 		}
 
 	return yy_current_state;
-}
+	}
+
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
+
+#ifdef YY_USE_PROTOS
+static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
+#else
+static yy_state_type yy_try_NUL_trans( yy_current_state )
+yy_state_type yy_current_state;
+#endif
+	{
 	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
+	register char *yy_cp = yy_c_buf_p;
 
 	register YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
-		(yy_last_accepting_state) = yy_current_state;
-		(yy_last_accepting_cpos) = yy_cp;
+		yy_last_accepting_state = yy_current_state;
+		yy_last_accepting_cpos = yy_cp;
 		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
@@ -1456,73 +1392,80 @@ static int yy_get_next_buffer (void)
 	yy_is_jam = (yy_current_state == 334);
 
 	return yy_is_jam ? 0 : yy_current_state;
-}
+	}
 
-    static void yyunput (int c, register char * yy_bp )
-{
-	register char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
+
+#ifndef YY_NO_UNPUT
+#ifdef YY_USE_PROTOS
+static void yyunput( int c, register char *yy_bp )
+#else
+static void yyunput( c, yy_bp )
+int c;
+register char *yy_bp;
+#endif
+	{
+	register char *yy_cp = yy_c_buf_p;
 
 	/* undo effects of setting up yytext */
-	*yy_cp = (yy_hold_char);
+	*yy_cp = yy_hold_char;
 
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = (yy_n_chars) + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register int number_to_move = yy_n_chars + 2;
+		register char *dest = &yy_current_buffer->yy_ch_buf[
+					yy_current_buffer->yy_buf_size + 2];
 		register char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+				&yy_current_buffer->yy_ch_buf[number_to_move];
 
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+		while ( source > yy_current_buffer->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+		yy_current_buffer->yy_n_chars =
+			yy_n_chars = yy_current_buffer->yy_buf_size;
 
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
-	(yytext_ptr) = yy_bp;
-	(yy_hold_char) = *yy_cp;
-	(yy_c_buf_p) = yy_cp;
-}
 
-#ifndef YY_NO_INPUT
+	yytext_ptr = yy_bp;
+	yy_hold_char = *yy_cp;
+	yy_c_buf_p = yy_cp;
+	}
+#endif	/* ifndef YY_NO_UNPUT */
+
+
 #ifdef __cplusplus
-    static int yyinput (void)
+static int yyinput()
 #else
-    static int input  (void)
+static int input()
 #endif
-
-{
+	{
 	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+	*yy_c_buf_p = yy_hold_char;
+
+	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
 			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
+			*yy_c_buf_p = '\0';
 
 		else
 			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
+			int offset = yy_c_buf_p - yytext_ptr;
+			++yy_c_buf_p;
 
-			switch ( yy_get_next_buffer(  ) )
+			switch ( yy_get_next_buffer() )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -1536,16 +1479,16 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					yyrestart(yyin );
+					yyrestart( yyin );
 
-					/*FALLTHROUGH*/
+					/* fall through */
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap( ) )
+					if ( yywrap() )
 						return EOF;
 
-					if ( ! (yy_did_buffer_switch_on_eof) )
+					if ( ! yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -1555,92 +1498,90 @@ static int yy_get_next_buffer (void)
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
+					yy_c_buf_p = yytext_ptr + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve yytext */
-	(yy_hold_char) = *++(yy_c_buf_p);
+	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
+	*yy_c_buf_p = '\0';	/* preserve yytext */
+	yy_hold_char = *++yy_c_buf_p;
+
 
 	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
+	}
 
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void yyrestart  (FILE * input_file )
-{
-    
-	if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
+
+#ifdef YY_USE_PROTOS
+void yyrestart( FILE *input_file )
+#else
+void yyrestart( input_file )
+FILE *input_file;
+#endif
+	{
+	if ( ! yy_current_buffer )
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+
+	yy_init_buffer( yy_current_buffer, input_file );
+	yy_load_buffer_state();
 	}
 
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
 
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-    
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
-     */
-	yyensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
+#ifdef YY_USE_PROTOS
+void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
+#else
+void yy_switch_to_buffer( new_buffer )
+YY_BUFFER_STATE new_buffer;
+#endif
+	{
+	if ( yy_current_buffer == new_buffer )
 		return;
 
-	if ( YY_CURRENT_BUFFER )
+	if ( yy_current_buffer )
 		{
 		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		*yy_c_buf_p = yy_hold_char;
+		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
+		yy_current_buffer->yy_n_chars = yy_n_chars;
 		}
 
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
+	yy_current_buffer = new_buffer;
+	yy_load_buffer_state();
 
 	/* We don't actually know whether we did this switch during
 	 * EOF (yywrap()) processing, but the only time this flag
 	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
+	yy_did_buffer_switch_on_eof = 1;
+	}
 
-static void yy_load_buffer_state  (void)
-{
-    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
 
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
-{
+#ifdef YY_USE_PROTOS
+void yy_load_buffer_state( void )
+#else
+void yy_load_buffer_state()
+#endif
+	{
+	yy_n_chars = yy_current_buffer->yy_n_chars;
+	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
+	yyin = yy_current_buffer->yy_input_file;
+	yy_hold_char = *yy_c_buf_p;
+	}
+
+
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
+#else
+YY_BUFFER_STATE yy_create_buffer( file, size )
+FILE *file;
+int size;
+#endif
+	{
 	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1649,75 +1590,80 @@ static void yy_load_buffer_state  (void)
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer(b,file );
+	yy_init_buffer( b, file );
 
 	return b;
-}
+	}
 
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
+
+#ifdef YY_USE_PROTOS
+void yy_delete_buffer( YY_BUFFER_STATE b )
+#else
+void yy_delete_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+	{
 	if ( ! b )
 		return;
 
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+	if ( b == yy_current_buffer )
+		yy_current_buffer = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
+		yy_flex_free( (void *) b->yy_ch_buf );
 
-	yyfree((void *) b  );
-}
+	yy_flex_free( (void *) b );
+	}
 
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-{
-	int oerrno = errno;
-    
-	yy_flush_buffer(b );
+#ifndef YY_ALWAYS_INTERACTIVE
+#ifndef YY_NEVER_INTERACTIVE
+extern int isatty YY_PROTO(( int ));
+#endif
+#endif
+
+#ifdef YY_USE_PROTOS
+void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
+#else
+void yy_init_buffer( b, file )
+YY_BUFFER_STATE b;
+FILE *file;
+#endif
+
+
+	{
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-	errno = oerrno;
-}
+#if YY_ALWAYS_INTERACTIVE
+	b->yy_is_interactive = 1;
+#else
+#if YY_NEVER_INTERACTIVE
+	b->yy_is_interactive = 0;
+#else
+	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+#endif
+#endif
+	}
 
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
-{
-    	if ( ! b )
+
+#ifdef YY_USE_PROTOS
+void yy_flush_buffer( YY_BUFFER_STATE b )
+#else
+void yy_flush_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+
+	{
+	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1734,121 +1680,29 @@ extern int isatty (int );
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-    	if (new_buffer == NULL)
-		return;
-
-	yyensure_buffer_stack();
-
-	/* This block is copied from yy_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-void yypop_buffer_state (void)
-{
-    	if (!YY_CURRENT_BUFFER)
-		return;
-
-	yy_delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
-	int num_to_alloc;
-    
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
+	if ( b == yy_current_buffer )
+		yy_load_buffer_state();
 	}
 
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
 
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
-{
+#ifndef YY_NO_SCAN_BUFFER
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
+#else
+YY_BUFFER_STATE yy_scan_buffer( base, size )
+char *base;
+yy_size_t size;
+#endif
+	{
 	YY_BUFFER_STATE b;
-    
+
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -1862,42 +1716,47 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer(b  );
+	yy_switch_to_buffer( b );
 
 	return b;
-}
+	}
+#endif
 
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
-{
-    
-	return yy_scan_bytes(yy_str,strlen(yy_str) );
-}
 
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
-{
+#ifndef YY_NO_SCAN_STRING
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
+#else
+YY_BUFFER_STATE yy_scan_string( yy_str )
+yyconst char *yy_str;
+#endif
+	{
+	int len;
+	for ( len = 0; yy_str[len]; ++len )
+		;
+
+	return yy_scan_bytes( yy_str, len );
+	}
+#endif
+
+
+#ifndef YY_NO_SCAN_BYTES
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
+#else
+YY_BUFFER_STATE yy_scan_bytes( bytes, len )
+yyconst char *bytes;
+int len;
+#endif
+	{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-    
+
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = len + 2;
-	buf = (char *) yyalloc(n  );
+	buf = (char *) yy_flex_alloc( n );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -1906,7 +1765,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
 
 	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer(buf,n );
+	b = yy_scan_buffer( buf, n );
 	if ( ! b )
 		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
@@ -1916,164 +1775,148 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
 	b->yy_is_our_buffer = 1;
 
 	return b;
-}
+	}
+#endif
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
+
+#ifndef YY_NO_PUSH_STATE
+#ifdef YY_USE_PROTOS
+static void yy_push_state( int new_state )
+#else
+static void yy_push_state( new_state )
+int new_state;
 #endif
+	{
+	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+		{
+		yy_size_t new_size;
 
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
+		yy_start_stack_depth += YY_START_STACK_INCR;
+		new_size = yy_start_stack_depth * sizeof( int );
 
-/* Redefine yyless() so it works in section 3 code. */
+		if ( ! yy_start_stack )
+			yy_start_stack = (int *) yy_flex_alloc( new_size );
 
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = (yy_hold_char); \
-		(yy_c_buf_p) = yytext + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
+		else
+			yy_start_stack = (int *) yy_flex_realloc(
+					(void *) yy_start_stack, new_size );
 
-/* Accessor  methods (get/set functions) to struct members. */
+		if ( ! yy_start_stack )
+			YY_FATAL_ERROR(
+			"out of memory expanding start-condition stack" );
+		}
 
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
+	yy_start_stack[yy_start_stack_ptr++] = YY_START;
 
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
+	BEGIN(new_state);
+	}
+#endif
 
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
 
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state()
+	{
+	if ( --yy_start_stack_ptr < 0 )
+		YY_FATAL_ERROR( "start-condition stack underflow" );
 
-/** Get the current token.
- * 
- */
+	BEGIN(yy_start_stack[yy_start_stack_ptr]);
+	}
+#endif
 
-char *yyget_text  (void)
-{
-        return yytext;
-}
 
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state()
+	{
+	return yy_start_stack[yy_start_stack_ptr - 1];
+	}
+#endif
 
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  in_str )
-{
-        yyin = in_str ;
-}
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
 
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_str ;
-}
+#ifdef YY_USE_PROTOS
+static void yy_fatal_error( yyconst char msg[] )
+#else
+static void yy_fatal_error( msg )
+char msg[];
+#endif
+	{
+	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+	}
 
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
 
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
 
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer(YY_CURRENT_BUFFER  );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state();
-	}
+/* Redefine yyless() so it works in section 3 code. */
 
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+		yytext[yyleng] = yy_hold_char; \
+		yy_c_buf_p = yytext + n; \
+		yy_hold_char = *yy_c_buf_p; \
+		*yy_c_buf_p = '\0'; \
+		yyleng = n; \
+		} \
+	while ( 0 )
 
-    return 0;
-}
 
-/*
- * Internal utility routines.
- */
+/* Internal utility routines. */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
+#ifdef YY_USE_PROTOS
+static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
+#else
+static void yy_flex_strncpy( s1, s2, n )
+char *s1;
+yyconst char *s2;
+int n;
+#endif
+	{
 	register int i;
-    	for ( i = 0; i < n; ++i )
+	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-}
+	}
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
+#ifdef YY_USE_PROTOS
+static int yy_flex_strlen( yyconst char *s )
+#else
+static int yy_flex_strlen( s )
+yyconst char *s;
+#endif
+	{
 	register int n;
-    	for ( n = 0; s[n]; ++n )
+	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-}
+	}
 #endif
 
-void *yyalloc (yy_size_t  size )
-{
+
+#ifdef YY_USE_PROTOS
+static void *yy_flex_alloc( yy_size_t size )
+#else
+static void *yy_flex_alloc( size )
+yy_size_t size;
+#endif
+	{
 	return (void *) malloc( size );
-}
+	}
 
-void *yyrealloc  (void * ptr, yy_size_t  size )
-{
+#ifdef YY_USE_PROTOS
+static void *yy_flex_realloc( void *ptr, yy_size_t size )
+#else
+static void *yy_flex_realloc( ptr, size )
+void *ptr;
+yy_size_t size;
+#endif
+	{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -2082,25 +1925,23 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
+	}
 
-#undef YY_NEW_FILE
-#undef YY_FLUSH_BUFFER
-#undef yy_set_bol
-#undef yy_new_buffer
-#undef yy_set_interactive
-#undef yytext_ptr
-#undef YY_DO_BEFORE_ACTION
+#ifdef YY_USE_PROTOS
+static void yy_flex_free( void *ptr )
+#else
+static void yy_flex_free( ptr )
+void *ptr;
+#endif
+	{
+	free( ptr );
+	}
 
-#ifdef YY_DECL_IS_OURS
-#undef YY_DECL_IS_OURS
-#undef YY_DECL
+#if YY_MAIN
+int main()
+	{
+	yylex();
+	return 0;
+	}
 #endif
 #line 116 "printrcl.l"
diff --git a/src/gutenprintui2/printrcy.c b/src/gutenprintui2/printrcy.c
index 4495ae6..0c96062 100644
--- a/src/gutenprintui2/printrcy.c
+++ b/src/gutenprintui2/printrcy.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -196,29 +196,22 @@ typedef int YYSTYPE;
 
 
 /* Line 214 of yacc.c.  */
-#line 200 "printrcy.c"
+#line 199 "printrcy.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
-# ifndef YYFREE
-#  define YYFREE free
-# endif
-# ifndef YYMALLOC
-#  define YYMALLOC malloc
-# endif
-
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   define YYSTACK_ALLOC alloca
-#  endif
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
 # else
-#  if defined (alloca) || defined (_ALLOCA_H)
-#   define YYSTACK_ALLOC alloca
-#  else
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
 #   endif
 #  endif
 # endif
@@ -231,20 +224,20 @@ typedef int YYSTYPE;
 #   include  /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T size_t
 #  endif
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+	 || (YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  short yyss;
   YYSTYPE yyvs;
   };
 
@@ -254,13 +247,13 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
@@ -296,7 +289,7 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short int yysigned_char;
+   typedef short yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
@@ -396,7 +389,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const unsigned short yyrline[] =
 {
        0,   100,   100,   111,   118,   128,   138,   148,   158,   164,
      168,   172,   176,   180,   184,   188,   206,   210,   214,   217,
@@ -414,32 +407,32 @@ static const unsigned short int yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION",
-  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER",
-  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING",
-  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP",
-  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR",
-  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS",
-  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL",
-  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE",
-  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination",
-  "Queue_Name", "Output_Filename", "Extra_Printer_Options",
-  "Custom_Command", "Command_Type", "Scaling", "Orientation",
-  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type",
-  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param",
-  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param",
-  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", "Parameters",
-  "Standard_Value", "Standard_Values", "A_Printer", "Printers",
-  "Current_Printer", "Show_All_Paper_Sizes", "Global", "Old_Globals",
-  "New_Global_Setting", "Global_Setting", "Global_Settings",
-  "Global_Subblock", "Global_Block", "Thing", 0
+  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION", 
+  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER", 
+  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING", 
+  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP", 
+  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR", 
+  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS", 
+  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL", 
+  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE", 
+  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination", 
+  "Queue_Name", "Output_Filename", "Extra_Printer_Options", 
+  "Custom_Command", "Command_Type", "Scaling", "Orientation", 
+  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type", 
+  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param", 
+  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param", 
+  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", 
+  "Parameters", "Standard_Value", "Standard_Values", "A_Printer", 
+  "Printers", "Current_Printer", "Show_All_Paper_Sizes", "Global", 
+  "Old_Globals", "New_Global_Setting", "Global_Setting", 
+  "Global_Settings", "Global_Subblock", "Global_Block", "Thing", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
+static const unsigned short yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -603,8 +596,7 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
+#define YYERROR		goto yyerrlab1
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -638,11 +630,11 @@ while (0)
    are run).  */
 
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)		\
-   ((Current).first_line   = (Rhs)[1].first_line,	\
-    (Current).first_column = (Rhs)[1].first_column,	\
-    (Current).last_line    = (Rhs)[N].last_line,	\
-    (Current).last_column  = (Rhs)[N].last_column)
+# define YYLLOC_DEFAULT(Current, Rhs, N)         \
+  Current.first_line   = Rhs[1].first_line;      \
+  Current.first_column = Rhs[1].first_column;    \
+  Current.last_line    = Rhs[N].last_line;       \
+  Current.last_column  = Rhs[N].last_column;
 #endif
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
@@ -686,17 +678,17 @@ do {								\
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
+| TOP (cinluded).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (short *bottom, short *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+    short *bottom;
+    short *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -726,9 +718,9 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned int yylno = yyrline[yyrule];
+  unsigned int yylineno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylno);
+             yyrule - 1, yylineno);
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
     YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
@@ -765,7 +757,7 @@ int yydebug;
    SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+#if YYMAXDEPTH == 0
 # undef YYMAXDEPTH
 #endif
 
@@ -963,9 +955,9 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  register short int *yyssp;
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
@@ -1002,7 +994,6 @@ yyparse ()
   yyssp = yyss;
   yyvsp = yyvs;
 
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1028,7 +1019,7 @@ yyparse ()
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
@@ -1056,7 +1047,7 @@ yyparse ()
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
@@ -1463,8 +1454,8 @@ yyreduce:
 
     }
 
-/* Line 1010 of yacc.c.  */
-#line 1468 "printrcy.c"
+/* Line 991 of yacc.c.  */
+#line 1458 "printrcy.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1505,33 +1496,18 @@ yyerrlab:
 	{
 	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
-	  const char* yyprefix;
 	  char *yymsg;
-	  int yyx;
+	  int yyx, yycount;
 
+	  yycount = 0;
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 0;
-
-	  yyprefix = ", expecting ";
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-		yycount += 1;
-		if (yycount == 5)
-		  {
-		    yysize = 0;
-		    break;
-		  }
-	      }
-	  yysize += (sizeof ("syntax error, unexpected ")
-		     + yystrlen (yytname[yytype]));
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("syntax error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[yytype]);
 	  yymsg = (char *) YYSTACK_ALLOC (yysize);
 	  if (yymsg != 0)
 	    {
@@ -1540,13 +1516,16 @@ yyerrlab:
 
 	      if (yycount < 5)
 		{
-		  yyprefix = ", expecting ";
-		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+		  yycount = 0;
+		  for (yyx = yyn < 0 ? -yyn : 0;
+		       yyx < (int) (sizeof (yytname) / sizeof (char *));
+		       yyx++)
 		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		      {
-			yyp = yystpcpy (yyp, yyprefix);
+			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyq);
 			yyp = yystpcpy (yyp, yytname[yyx]);
-			yyprefix = " or ";
+			yycount++;
 		      }
 		}
 	      yyerror (yymsg);
@@ -1567,56 +1546,52 @@ yyerrlab:
       /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      if (yychar <= YYEOF)
+      /* Return failure if at end of input.  */
+      if (yychar == YYEOF)
         {
-          /* If at end of input, pop the error token,
-	     then the rest of the stack, then return failure.  */
-	  if (yychar == YYEOF)
-	     for (;;)
-	       {
-		 YYPOPSTACK;
-		 if (yyssp == yyss)
-		   YYABORT;
-		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-		 yydestruct (yystos[*yyssp], yyvsp);
-	       }
+	  /* Pop the error token.  */
+          YYPOPSTACK;
+	  /* Pop the rest of the stack.  */
+	  while (yyss < yyssp)
+	    {
+	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+	      yydestruct (yystos[*yyssp], yyvsp);
+	      YYPOPSTACK;
+	    }
+	  YYABORT;
         }
-      else
-	{
-	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-	  yydestruct (yytoken, &yylval);
-	  yychar = YYEMPTY;
 
-	}
+      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+      yydestruct (yytoken, &yylval);
+      yychar = YYEMPTY;
+
     }
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
-  goto yyerrlab1;
+  goto yyerrlab2;
 
 
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
+/*----------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action.  |
+`----------------------------------------------------*/
+yyerrlab1:
 
-#ifdef __GNUC__
-  /* Pacify GCC when the user code never invokes YYERROR and the label
-     yyerrorlab therefore never appears in user code.  */
-  if (0)
-     goto yyerrorlab;
+  /* Suppress GCC warning that yyerrlab1 is unused when no action
+     invokes YYERROR.  */
+#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \
+    && !defined __cplusplus
+  __attribute__ ((__unused__))
 #endif
 
-  yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
 
+  goto yyerrlab2;
 
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
+
+/*---------------------------------------------------------------.
+| yyerrlab2 -- pop states until the error token can be shifted.  |
+`---------------------------------------------------------------*/
+yyerrlab2:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1639,8 +1614,9 @@ yyerrlab1:
 
       YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
       yydestruct (yystos[yystate], yyvsp);
-      YYPOPSTACK;
-      yystate = *yyssp;
+      yyvsp--;
+      yystate = *--yyssp;
+
       YY_STACK_PRINT (yyss, yyssp);
     }
 
diff --git a/src/gutenprintui2/printrcy.h b/src/gutenprintui2/printrcy.h
index 2273fb7..afa662b 100644
--- a/src/gutenprintui2/printrcy.h
+++ b/src/gutenprintui2/printrcy.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 4eeda81..1bd64de 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -368,7 +368,6 @@ 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@
diff --git a/src/main/channel.c b/src/main/channel.c
index ca676bb..88d316d 100644
--- a/src/main/channel.c
+++ b/src/main/channel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: channel.c,v 1.26 2005/06/14 02:49:09 rlk Exp $"
+ * "$Id: channel.c,v 1.29 2005/07/14 23:43:30 rlk Exp $"
  *
  *   Dither routine entrypoints
  *
@@ -67,15 +67,19 @@ typedef struct
   unsigned channel_count;
   unsigned total_channels;
   unsigned input_channels;
+  unsigned gcr_channels;
+  unsigned aux_output_channels;
   size_t width;
   int initialized;
   unsigned ink_limit;
   unsigned max_density;
   stpi_channel_t *c;
+  stp_curve_t *gcr_curve;
   unsigned curve_count;
   unsigned gloss_limit;
   unsigned short *input_data;
   unsigned short *multi_tmp;
+  unsigned short *gcr_data;
   unsigned short *split_input;
   unsigned short *output_data;
   unsigned short *alloc_data_1;
@@ -116,8 +120,14 @@ stpi_channel_clear(void *vc)
   STP_SAFE_FREE(cg->alloc_data_2);
   STP_SAFE_FREE(cg->alloc_data_3);
   STP_SAFE_FREE(cg->c);
+  if (cg->gcr_curve)
+    {
+      stp_curve_destroy(cg->gcr_curve);
+      cg->gcr_curve = NULL;
+    }
   cg->channel_count = 0;
   cg->curve_count = 0;
+  cg->aux_output_channels = 0;
   cg->total_channels = 0;
   cg->input_channels = 0;
   cg->initialized = 0;
@@ -337,6 +347,31 @@ stp_channel_get_cutoff_adjustment(stp_vars_t *v, int color, int subchannel)
     return -1.0;
 }
 
+void
+stp_channel_set_gcr_curve(stp_vars_t *v, const stp_curve_t *curve)
+{
+  stpi_channel_group_t *cg =
+    ((stpi_channel_group_t *) stp_get_component_data(v, "Channel"));
+  if (!cg)
+    return;
+  stp_dprintf(STP_DBG_INK, v, "set_gcr_curve\n");
+  if (curve)
+    cg->gcr_curve = stp_curve_create_copy(curve);
+  else
+    cg->gcr_curve = NULL;
+}  
+
+const stp_curve_t *
+stp_channel_get_gcr_curve(stp_vars_t *v)
+{
+  stpi_channel_group_t *cg =
+    ((stpi_channel_group_t *) stp_get_component_data(v, "Channel"));
+  if (!cg)
+    return NULL;
+  stp_dprintf(STP_DBG_INK, v, "set_gcr_curve\n");
+  return cg->gcr_curve;
+}  
+
 void
 stp_channel_set_curve(stp_vars_t *v, int color, const stp_curve_t *curve)
 {
@@ -379,6 +414,14 @@ input_has_special_channels(const stp_vars_t *v)
   return (cg->curve_count > 0);
 }
 
+static int
+output_needs_gcr(const stp_vars_t *v)
+{
+  const stpi_channel_group_t *cg =
+    ((const stpi_channel_group_t *) stp_get_component_data(v, "Channel"));
+  return (cg->gcr_curve && cg->black_channel == 0);
+}
+
 static int
 output_has_gloss(const stp_vars_t *v)
 {
@@ -393,7 +436,7 @@ input_needs_splitting(const stp_vars_t *v)
   const stpi_channel_group_t *cg =
     ((const stpi_channel_group_t *) stp_get_component_data(v, "Channel"));
 #if 0
-  return cg->total_channels != cg->input_channels;
+  return cg->total_channels != cg->aux_output_channels;
 #else
   int i;
   if (!cg || cg->channel_count <= 0)
@@ -474,6 +517,8 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
 		  double lower_val = base * (1.0 - where);
 		  double lower_amount = lower_val / this_val;
 		  double upper_amount = (val - lower_val) / next_val;
+		  if (lower_amount > 65535.0)
+		    lower_amount = 65535.0;
 		  c->lut[val * sc + sc - k - 2] = upper_amount;
 		  c->lut[val * sc + sc - k - 1] = lower_amount;
 		  val++;
@@ -485,6 +530,8 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
 	      val++;
 	    }
 	}
+      if (cg->gloss_channel != i && c->subchannel_count > 0)
+	cg->aux_output_channels++;
       cg->total_channels += c->subchannel_count;
       for (j = 0; j < c->subchannel_count; j++)
 	cg->max_density += c->sc[j].s_density;
@@ -506,21 +553,29 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
   cg->output_data = cg->alloc_data_1;
   if (curve_count == 0)
     {
+      cg->gcr_channels = cg->input_channels;
       if (input_needs_splitting(v))
 	{
 	  cg->alloc_data_2 =
 	    stp_malloc(sizeof(unsigned short) * cg->input_channels * width);
 	  cg->input_data = cg->alloc_data_2;
 	  cg->split_input = cg->input_data;
+	  cg->gcr_data = cg->split_input;
 	}
       else if (cg->gloss_channel != -1)
 	{
 	  cg->alloc_data_2 =
 	    stp_malloc(sizeof(unsigned short) * cg->input_channels * width);
 	  cg->input_data = cg->alloc_data_2;
+	  cg->gcr_data = cg->output_data;
+	  cg->gcr_channels = cg->total_channels;
 	}
       else
-	cg->input_data = cg->output_data;
+	{
+	  cg->input_data = cg->output_data;
+	  cg->gcr_data = cg->output_data;
+	}
+      cg->aux_output_channels = cg->gcr_channels;
     }
   else
     {
@@ -530,19 +585,25 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
       if (input_needs_splitting(v))
 	{
 	  cg->alloc_data_3 =
-	    stp_malloc(sizeof(unsigned short) * cg->channel_count * width);
+	    stp_malloc(sizeof(unsigned short) * cg->aux_output_channels * width);
 	  cg->multi_tmp = cg->alloc_data_3;
 	  cg->split_input = cg->multi_tmp;
+	  cg->gcr_data = cg->split_input;
 	}
       else
 	{
 	  cg->multi_tmp = cg->alloc_data_1;
+	  cg->gcr_data = cg->output_data;
+	  cg->aux_output_channels = cg->total_channels;
 	}
+      cg->gcr_channels = cg->aux_output_channels;
     }
   stp_dprintf(STP_DBG_INK, v, "stp_channel_initialize:\n");
   stp_dprintf(STP_DBG_INK, v, "   channel_count  %d\n", cg->channel_count);
   stp_dprintf(STP_DBG_INK, v, "   total_channels %d\n", cg->total_channels);
   stp_dprintf(STP_DBG_INK, v, "   input_channels %d\n", cg->input_channels);
+  stp_dprintf(STP_DBG_INK, v, "   aux_channels   %d\n", cg->aux_output_channels);
+  stp_dprintf(STP_DBG_INK, v, "   gcr_channels   %d\n", cg->gcr_channels);
   stp_dprintf(STP_DBG_INK, v, "   width          %d\n", cg->width);
   stp_dprintf(STP_DBG_INK, v, "   ink_limit      %d\n", cg->ink_limit);
   stp_dprintf(STP_DBG_INK, v, "   gloss_limit    %d\n", cg->gloss_limit);
@@ -550,6 +611,7 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
   stp_dprintf(STP_DBG_INK, v, "   curve_count    %d\n", cg->curve_count);
   stp_dprintf(STP_DBG_INK, v, "   black_channel  %d\n", cg->black_channel);
   stp_dprintf(STP_DBG_INK, v, "   gloss_channel  %d\n", cg->gloss_channel);
+  stp_dprintf(STP_DBG_INK, v, "   gloss_physical %d\n", cg->gloss_physical_channel);
   stp_dprintf(STP_DBG_INK, v, "   input_data     %p\n",
 	      (void *) cg->input_data);
   stp_dprintf(STP_DBG_INK, v, "   multi_tmp      %p\n",
@@ -558,12 +620,16 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
 	      (void *) cg->split_input);
   stp_dprintf(STP_DBG_INK, v, "   output_data    %p\n",
 	      (void *) cg->output_data);
+  stp_dprintf(STP_DBG_INK, v, "   gcr_data       %p\n",
+	      (void *) cg->gcr_data);
   stp_dprintf(STP_DBG_INK, v, "   alloc_data_1   %p\n",
 	      (void *) cg->alloc_data_1);
   stp_dprintf(STP_DBG_INK, v, "   alloc_data_2   %p\n",
 	      (void *) cg->alloc_data_2);
   stp_dprintf(STP_DBG_INK, v, "   alloc_data_3   %p\n",
 	      (void *) cg->alloc_data_3);
+  stp_dprintf(STP_DBG_INK, v, "   gcr_curve      %p\n",
+	      (void *) cg->gcr_curve);
   for (i = 0; i < cg->channel_count; i++)
     {
       stp_dprintf(STP_DBG_INK, v, "   Channel %d:\n", i);
@@ -673,13 +739,29 @@ limit_ink(const stp_vars_t *v)
 }
 
 static inline int
-mem_eq(const unsigned short *i1, const unsigned short *i2, int count)
+short_eq(const unsigned short *i1, const unsigned short *i2, size_t count)
 {
+#if 1
   int i;
   for (i = 0; i < count; i++)
     if (i1[i] != i2[i])
       return 0;
   return 1;
+#else
+  return !memcmp(i1, i2, count * sizeof(unsigned short));
+#endif
+}
+
+static inline void
+short_copy(unsigned short *out, const unsigned short *in, size_t count)
+{
+#if 1
+  int i;
+  for (i = 0; i < count; i++)
+    out[i] = in[i];
+#else
+  (void) memcpy(out, in, count * sizeof(unsigned short));
+#endif
 }
 
 static void
@@ -746,19 +828,20 @@ generate_special_channels(const stp_vars_t *v)
   const unsigned short *output_cache = NULL;
   const unsigned short *input = cg->input_data;
   unsigned short *output = cg->multi_tmp;
-  int outbytes = cg->channel_count * sizeof(unsigned short);
+  int offset = (cg->black_channel >= 0 ? 0 : -1);
+  int outbytes = cg->aux_output_channels * sizeof(unsigned short);
   for (i = 0; i < cg->width;
-       input += cg->input_channels, output += cg->channel_count, i++)
+       input += cg->input_channels, output += cg->aux_output_channels, i++)
     {
-      if (input_cache && mem_eq(input_cache, input, cg->input_channels))
+      if (input_cache && short_eq(input_cache, input, cg->input_channels))
 	{
 	  memcpy(output, output_cache, outbytes);
 	}
       else
 	{
-	  int c = input[STP_ECOLOR_C];
-	  int m = input[STP_ECOLOR_M];
-	  int y = input[STP_ECOLOR_Y];
+	  int c = input[STP_ECOLOR_C + offset];
+	  int m = input[STP_ECOLOR_M + offset];
+	  int y = input[STP_ECOLOR_Y + offset];
 	  int min = FMIN(c, FMIN(m, y));
 	  int max = FMAX(c, FMAX(m, y));
 	  if (max > min)	/* Otherwise it's gray, and we don't care */
@@ -775,24 +858,28 @@ generate_special_channels(const stp_vars_t *v)
 	      m -= min;
 	      y -= min;
 	      max -= min;
-	      output[STP_ECOLOR_K] = input[STP_ECOLOR_K];
+	      if (offset == 0)
+		output[STP_ECOLOR_K] = input[STP_ECOLOR_K];
 	      hue = compute_hue(c, m, y, max);
-	      for (j = 1; j < cg->channel_count; j++)
+	      for (j = 1; j < cg->aux_output_channels - offset; j++)
 		{
 		  stpi_channel_t *ch = &(cg->c[j]);
-		  output[j] =
-		    max * interpolate_value(ch->hue_map,
-					    hue * ch->h_count / 6.0);
+		  if (ch->hue_map)
+		    output[j + offset] =
+		      max * interpolate_value(ch->hue_map,
+					      hue * ch->h_count / 6.0);
+		  else
+		    output[j + offset] = 0;
 		}
-	      output[STP_ECOLOR_C] += min;
-	      output[STP_ECOLOR_M] += min;
-	      output[STP_ECOLOR_Y] += min;
+	      output[STP_ECOLOR_C + offset] += min;
+	      output[STP_ECOLOR_M + offset] += min;
+	      output[STP_ECOLOR_Y + offset] += min;
 	    }
 	  else
 	    {
-	      for (j = 0; j < 4; j++)
+	      for (j = 0; j < 4 + offset; j++)
 		output[j] = input[j];
-	      for (j = 4; j < cg->channel_count; j++)
+	      for (j = 4 + offset; j < cg->aux_output_channels; j++)
 		output[j] = 0;
 	    }
 	}
@@ -818,10 +905,10 @@ split_channels(const stp_vars_t *v, unsigned *zero_mask)
   for (i = 0; i < cg->width; i++)
     {
       int zero_ptr = 0;
-      if (input_cache && mem_eq(input_cache, input, cg->input_channels))
+      if (input_cache && short_eq(input_cache, input, cg->aux_output_channels))
 	{
 	  memcpy(output, output_cache, outbytes);
-	  input += cg->input_channels;
+	  input += cg->aux_output_channels;
 	  output += cg->total_channels;
 	}
       else
@@ -832,7 +919,7 @@ split_channels(const stp_vars_t *v, unsigned *zero_mask)
 	  output_cache = output;
 	  if (cg->black_channel >= 0)
 	    black_value = input[cg->black_channel];
-	  for (j = 0; j < cg->channel_count; j++)
+	  for (j = 0; j < cg->aux_output_channels; j++)
 	    {
 	      if (input[j] < virtual_black && j != cg->black_channel)
 		virtual_black = input[j];
@@ -985,6 +1072,40 @@ generate_gloss(const stp_vars_t *v, unsigned *zero_mask)
     }
 }
 
+static void
+do_gcr(const stp_vars_t *v)
+{
+  stpi_channel_group_t *cg =
+    ((stpi_channel_group_t *) stp_get_component_data(v, "Channel"));
+  const unsigned short *gcr_lookup;
+  unsigned short *output = cg->gcr_data;
+  size_t count;
+  double cb = stp_get_float_parameter(v, "CyanBalance");
+  double mb = stp_get_float_parameter(v, "MagentaBalance");
+  double yb = stp_get_float_parameter(v, "YellowBalance");
+  int i;
+
+  stp_curve_resample(cg->gcr_curve, 65536);
+  gcr_lookup = stp_curve_get_ushort_data(cg->gcr_curve, &count);
+  for (i = 0; i < cg->width; i++)
+    {
+      unsigned k = output[0];
+      if (k > 0)
+	{
+	  int kk = gcr_lookup[k];
+	  int ck;
+	  if (kk > k)
+	    kk = k;
+	  ck = k - kk;
+	  output[0] = kk;
+	  output[1] += ck * cb;
+	  output[2] += ck * mb;
+	  output[3] += ck * yb;
+	}
+      output += cg->gcr_channels;
+    }
+}
+
 void
 stp_channel_convert(const stp_vars_t *v, unsigned *zero_mask)
 {
@@ -992,6 +1113,8 @@ stp_channel_convert(const stp_vars_t *v, unsigned *zero_mask)
     generate_special_channels(v);
   else if (output_has_gloss(v) && !input_needs_splitting(v))
     copy_channels(v);
+  if (output_needs_gcr(v))
+    do_gcr(v);
   if (input_needs_splitting(v))
     split_channels(v, zero_mask);
   else
diff --git a/src/main/color-conversion.h b/src/main/color-conversion.h
index ed87811..28deb53 100644
--- a/src/main/color-conversion.h
+++ b/src/main/color-conversion.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: color-conversion.h,v 1.9 2005/06/30 01:34:58 rlk Exp $"
+ * "$Id: color-conversion.h,v 1.10 2005/07/04 00:23:54 rlk Exp $"
  *
  *   Gutenprint color management module - traditional Gimp-Print algorithm.
  *
@@ -163,7 +163,6 @@ typedef struct
   stp_cached_curve_t hue_map;
   stp_cached_curve_t lum_map;
   stp_cached_curve_t sat_map;
-  stp_cached_curve_t gcr_curve;
   unsigned short *gray_tmp;	/* Color -> Gray */
   unsigned short *cmy_tmp;	/* CMY -> CMYK */
   unsigned char *in_data;
diff --git a/src/main/color-conversions.c b/src/main/color-conversions.c
index 2b354c6..1959613 100644
--- a/src/main/color-conversions.c
+++ b/src/main/color-conversions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: color-conversions.c,v 1.18 2005/07/01 01:40:08 rlk Exp $"
+ * "$Id: color-conversions.c,v 1.20 2005/07/04 00:23:54 rlk Exp $"
  *
  *   Gimp-Print color management module - traditional Gimp-Print algorithm.
  *
@@ -365,107 +365,6 @@ short_copy(unsigned short *out, const unsigned short *in, size_t count)
 #endif
 }
 
-static unsigned
-generic_cmy_to_kcmy(const stp_vars_t *vars, const unsigned short *in,
-		    unsigned short *out)
-{
-  lut_t *lut = (lut_t *)(stp_get_component_data(vars, "Color"));
-  int width = lut->image_width;
-  int step = 65535 / (lut->steps - 1); /* 1 or 257 */
-
-  const unsigned short *gcr_lookup;
-  const unsigned short *black_lookup;
-  int i;
-  int i0 = -1;
-  int i1 = -1;
-  int i2 = -1;
-  unsigned short o0 = 0;
-  unsigned short o1 = 0;
-  unsigned short o2 = 0;
-  unsigned short o3 = 0;
-  unsigned short nz0 = 0;
-  unsigned short nz1 = 0;
-  unsigned short nz2 = 0;
-  unsigned short nz3 = 0;
-
-  stp_curve_resample(stp_curve_cache_get_curve(&(lut->gcr_curve)), lut->steps);
-  gcr_lookup = stp_curve_cache_get_ushort_data(&(lut->gcr_curve));
-  stp_curve_resample(stp_curve_cache_get_curve
-		     (&(lut->channel_curves[CHANNEL_K])), lut->steps);
-  black_lookup =
-    stp_curve_cache_get_ushort_data(&(lut->channel_curves[CHANNEL_K]));
-
-  for (i = 0; i < width; i++, out += 4, in += 3)
-    {
-      if (i0 == in[0] && i1 == in[1] && i2 == in[2])
-	{
-	  out[0] = o0;
-	  out[1] = o1;
-	  out[2] = o2;
-	  out[3] = o3;
-	}
-      else
-	{
-	  int k;
-	  i0 = in[0];
-	  i1 = in[1];
-	  i2 = in[2];
-	  k = FMIN(i0, FMIN(i1, i2));
-	  out[0] = 0;
-	  out[1] = i0;
-	  out[2] = i1;
-	  out[3] = i2;
-	  if (k > 0)
-	    {
-	      int where, resid;
-	      int kk;
-	      if (lut->steps == 65536)
-		kk = gcr_lookup[k];
-	      else
-		{
-		  where = k / step;
-		  resid = k % step;
-		  kk = gcr_lookup[where];
-		  if (resid > 0)
-		    kk += (gcr_lookup[where + 1] - gcr_lookup[where]) * resid /
-		      step;
-		}
-	      if (kk > k)
-		kk = k;
-	      if (kk > 0)
-		{
-		  if (lut->steps == 65536)
-		    out[0] = black_lookup[kk];
-		  else
-		    {
-		      int k_out;
-		      where = kk / step;
-		      resid = kk % step;
-		      k_out = black_lookup[where];
-		      if (resid > 0)
-			k_out +=
-			  (black_lookup[where + 1] - black_lookup[where]) *
-			  resid / step;
-		      out[0] = k_out;
-		    }
-		  out[1] -= kk;
-		  out[2] -= kk;
-		  out[3] -= kk;
-		}
-	    }
-	  o0 = out[0];
-	  o1 = out[1];
-	  o2 = out[2];
-	  o3 = out[3];
-	  nz0 |= o0;
-	  nz1 |= o1;
-	  nz2 |= o2;
-	  nz3 |= o3;
-	}
-    }
-  return (nz0 ? 0 : 1) + (nz1 ? 0 : 2) + (nz2 ? 0 : 4) + (nz3 ? 0 : 8);
-}
-
 static unsigned
 raw_cmy_to_kcmy(const stp_vars_t *vars, const unsigned short *in,
 		unsigned short *out)
@@ -881,20 +780,20 @@ name##_##bits##_to_##name2(const stp_vars_t *vars, const unsigned char *in, \
   return status;							    \
 }
 
-COLOR_TO_KCMY_FUNC(gray, kcmy, color, generic, 8)
-COLOR_TO_KCMY_FUNC(gray, kcmy, color, generic, 16)
+COLOR_TO_KCMY_FUNC(gray, kcmy, color, raw, 8)
+COLOR_TO_KCMY_FUNC(gray, kcmy, color, raw, 16)
 GENERIC_COLOR_FUNC(gray, kcmy)
 
 COLOR_TO_KCMY_FUNC(gray, kcmy_raw, color_raw, raw, 8)
 COLOR_TO_KCMY_FUNC(gray, kcmy_raw, color_raw, raw, 16)
 GENERIC_COLOR_FUNC(gray, kcmy_raw)
 
-COLOR_TO_KCMY_FUNC(color, kcmy, color, generic, 8)
-COLOR_TO_KCMY_FUNC(color, kcmy, color, generic, 16)
+COLOR_TO_KCMY_FUNC(color, kcmy, color, raw, 8)
+COLOR_TO_KCMY_FUNC(color, kcmy, color, raw, 16)
 GENERIC_COLOR_FUNC(color, kcmy)
 
-COLOR_TO_KCMY_FUNC(color, kcmy_fast, color_fast, generic, 8)
-COLOR_TO_KCMY_FUNC(color, kcmy_fast, color_fast, generic, 16)
+COLOR_TO_KCMY_FUNC(color, kcmy_fast, color_fast, raw, 8)
+COLOR_TO_KCMY_FUNC(color, kcmy_fast, color_fast, raw, 16)
 GENERIC_COLOR_FUNC(color, kcmy_fast)
 
 COLOR_TO_KCMY_FUNC(color, kcmy_raw, color_raw, raw, 8)
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 7d9a839..2946e06 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.54 2005/06/26 22:07:46 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.56 2005/07/03 22:13:36 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -165,7 +165,7 @@ static hue_curve_t r800_red_curve =
   "\n"
   /* C */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
   /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.000 0.350 0.550 0.700 0.850 1.000 1.000 1.000 "  /* R */
+  /* M */  "0.025 0.400 0.600 0.750 0.890 1.000 1.000 1.000 "  /* R */
   /* R */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* Y */
   /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
   /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
@@ -181,9 +181,9 @@ static hue_curve_t r800_blue_curve =
   "\n"
   "\n"
   "\n"
-  /* C */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* B */
-  /* B */  "1.000 1.000 1.000 1.000 0.900 0.800 0.500 0.200 "  /* M */
-  /* M */  "0.005 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
+  /* C */  "0.000 0.250 0.475 0.700 0.810 0.875 0.940 1.000 "  /* B */
+  /* B */  "1.000 0.975 0.930 0.875 0.810 0.740 0.650 0.400 "  /* M */
+  /* M */  "0.040 0.002 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
   /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
   /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
   /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
@@ -1725,8 +1725,8 @@ static const shade_set_t photo_gen2_shades =	/* Stylus 870 and newer */
 static const shade_set_t photo_gen3_shades =	/* Stylus R300 and newer */
 {
   { 1, { 1.0 }},
-  { 2, { 1.0, 0.35 }},
-  { 2, { 1.0, 0.35 }},
+  { 2, { 1.0, 0.3 }},
+  { 2, { 1.0, 0.3 }},
   { 1, { 1.0 }},
   { 1, { 1.0 }},
   { 1, { 1.0 }},
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index ce892b4..90d59e7 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-papers.c,v 1.75 2005/07/01 01:40:09 rlk Exp $"
+ * "$Id: escp2-papers.c,v 1.77 2005/07/03 22:13:36 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -156,8 +156,8 @@ static const char photo3_hue_adj[] =
 "\n"
 "\n"
 "\n"
-/* C */  "0.00 0.00 0.00 -.02 -.04 -.08 -.12 -.16 "  /* B */
-/* B */  "-.20 -.24 -.28 -.32 -.32 -.32 -.32 -.32 "  /* M */
+/* C */  "0.00 -.01 -.03 -.06 -.10 -.15 -.20 -.25 "  /* B */
+/* B */  "-.28 -.30 -.34 -.35 -.35 -.34 -.33 -.33 "  /* M */
 /* M */  "-.36 -.40 -.44 -.48 -.50 -.45 -.40 -.30 "  /* R */
 /* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
 /* Y */  "0.00 -.00 -.00 -.00 -.02 -.04 -.08 -.13 "  /* G */
@@ -416,7 +416,7 @@ static const char r800_glossy_lum_adj[] =
 "\n"
 "\n"
 /* C */  "0.75 0.75 0.75 0.75 0.76 0.80 0.85 0.90 "  /* B */
-/* B */  "0.90 0.88 0.82 0.78 0.78 0.82 0.85 0.92 "  /* M */
+/* B */  "0.90 0.88 0.82 0.85 0.87 0.89 0.91 0.95 "  /* M */
 /* M */  "0.98 0.98 0.97 0.97 0.96 0.96 0.96 0.96 "  /* R */
 /* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
 /* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.96 0.93 "  /* G */
@@ -431,7 +431,7 @@ static const char r800_glossy_hue_adj[] =
 "\n"
 "\n"
 /* C */  "0.00 -.07 -.10 -.15 -.19 -.25 -.30 -.35 "  /* B */
-/* B */  "-.38 -.38 -.30 -.20 -.10 -.00 0.02 0.02 "  /* M */
+/* B */  "-.38 -.38 -.30 -.20 -.10 -.00 0.00 0.00 "  /* M */
 /* M */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 0.00 "  /* R */
 /* R */  "0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 "  /* Y */
 /* Y */  "0.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* G */
@@ -590,43 +590,43 @@ DECLARE_PAPER_ADJUSTMENTS(photo2);
 
 static const paper_adjustment_t photo3_adjustments[] =
 {
-  { "Plain", 0.738, .5, 0.75, .1, .9, 1, .525, .816, .75, 1, 1.0,
+  { "Plain", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "PlainFast", 0.738, .5, 0.75, .1, .9, 1, .525, .816, .75, 1, 1.0,
+  { "PlainFast", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Postcard", 0.83, .5, 0.75, .1, .9, 1, .525, .816, .75, 1, 1.0,
+  { "Postcard", 0.83, .35, 0.5, .2, .9, 1, .59, .7, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyFilm", 1.00, .5, 0.75, .2, .999, 1, .525, .816, .75, 1, 1,
+  { "GlossyFilm", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Transparency", 1.00, .5, 0.75, .2, .999, 1, .525, .816, .75, 1, 1,
+  { "Transparency", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Envelope", 0.738, .5, 0.75, .1, .9, 1, .525, .816, .75, 1, 1.0,
+  { "Envelope", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "BackFilm", 1.00, .5, 0.75, .2, .999, 1, .525, .816, .75, 1, 1,
+  { "BackFilm", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Matte", 0.85, .75, 0.75, .3, .999, 1, .525, .816, .75, 1, 1,
+  { "Matte", 0.85, .35, 0.75, .3, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "MatteHeavy", 0.85, .75, .3, .2, .999, 1, .525, .816, .75, 1, 1,
+  { "MatteHeavy", 0.85, .35, .3, .3, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Inkjet", 0.85, .5, 0.75, .15, .9, 1, .525, .816, .75, 1, 1,
+  { "Inkjet", 0.85, .35, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Coated", 1.2, .5, .75, .15, .999, 1, .525, .816, .75, 1, 1,
+  { "Coated", 1.2, .35, .5, .3, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Photo", 1.00, .5, 0.75, .2, .999, 1, .525, .816, .75, 1, 1,
+  { "Photo", 1.00, .35, 0.5, .3, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyPhoto", 1.0, .25, 0.5, .3, .999, 1, .6, .82, .66, 1, 0.85,
+  { "GlossyPhoto", 1.0, .25, 0.5, .3, .999, 1, .6, .83, .66, 1, 0.85,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Semigloss", 1.0, .25, 0.5, .3, .999, 1, .525, .816, .75, 1, 0.92,
+  { "Semigloss", 1.0, .25, 0.5, .3, .999, 1, .59, .7, .9, 1, 0.92,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Luster", 1.0, .25, 0.5, .3, .999, 1, .525, .816, .75, 1, 0.92,
+  { "Luster", 1.0, .25, 0.5, .3, .999, 1, .59, .7, .9, 1, 0.92,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyPaper", 1.00, .5, 0.75, .2, .999, 1, .525, .816, .75, 1, 1,
+  { "GlossyPaper", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Ilford", .85, .5, 0.75, .2, .999, 1, .525, .816, .75, 1, 1,
+  { "Ilford", .85, .25, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj  },
-  { "ColorLife", 1.00, .5, 0.75, .2, .9, 1, .525, .816, .75, 1, 1,
+  { "ColorLife", 1.00, .35, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Other", 0.738, .5, 0.75, .1, .9, 1, .525, .816, .75, 1, 1,
+  { "Other", 0.738, .35, 0.5, .5, .9, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
 };
 
@@ -772,47 +772,47 @@ DECLARE_PAPER_ADJUSTMENTS(ultrachrome_matte);
 
 static const paper_adjustment_t r800_photo_adjustments[] =
 {
-  { "Plain", 0.72, .1, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "Plain", 0.72, .1, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "PlainFast", 0.72, .1, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "PlainFast", 0.72, .1, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Postcard", 0.72, .1, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "Postcard", 0.72, .1, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "GlossyFilm", 0.83, 1.0, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Transparency", 0.83, .75, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "Transparency", 0.83, .75, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Envelope", 0.72, .1, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "Envelope", 0.72, .1, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "BackFilm", 0.83, .75, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Glossy", 0.92, 0.4, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "Glossy", 0.92, 0.4, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyHeavy", 0.92, 0.4, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "GlossyHeavy", 0.92, 0.4, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Inkjet", 0.72, .5, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "Inkjet", 0.72, .5, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Coated", 0.83, .5, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "Coated", 0.83, .5, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Photo", 1.0, .75, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "Photo", 1.0, .75, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyPhoto", 0.72, 1, 1, .1, 0.5, .882, 1, .300, 1, 1, 0.92,
+  { "GlossyPhoto", 0.72, 1, 1, .02, 0.3, .882, 1, .300, 1, 1, 0.92,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .1, 0.5, .882, 1, .300, 1, 1, 0.92,
+  { "Semigloss", 0.72, .8, 1, .02, 0.3, .882, 1, .300, 1, 1, 0.92,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .1, .5, .882, 1, .300, 1, 1, 0.92,
+  { "Luster", 0.72, .8, 1, .02, .3, .882, 1, .300, 1, 1, 0.92,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "ArchivalGlossy", 0.92, .4, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "ArchivalGlossy", 0.92, .4, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "WaterColorRadiant", 0.92, .4, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "WaterColorRadiant", 0.92, .4, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyPaper", 0.83, 1.0, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "GlossyPaper", 0.83, 1.0, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Ilford", 0.83, 1.0, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "Ilford", 0.83, 1.0, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj  },
-  { "ColorLife", 0.83, 1.0, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "ColorLife", 0.83, 1.0, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Other", 0.72, .1, 1, .1, 0.5, .882, 1, .300, 1, 1, 1.0,
+  { "Other", 0.72, .1, 1, .02, 0.3, .882, 1, .300, 1, 1, 1.0,
     r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
 };
 
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index a07699c..f5a5496 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-canon.c,v 1.155 2005/05/08 03:10:37 rlk Exp $"
+ * "$Id: print-canon.c,v 1.156 2005/07/03 22:13:36 rlk Exp $"
  *
  *   Print plug-in CANON BJL driver for the GIMP.
  *
@@ -1277,32 +1277,32 @@ static const float_param_t float_parameters[] =
 {
   {
     {
-      "CyanDensity", N_("Cyan Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the cyan balance"),
+      "CyanDensity", N_("Cyan Density"), N_("Output Level Adjustment"),
+      N_("Adjust the cyan density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 1, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "MagentaDensity", N_("Magenta Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the magenta balance"),
+      "MagentaDensity", N_("Magenta Density"), N_("Output Level Adjustment"),
+      N_("Adjust the magenta density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 2, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "YellowDensity", N_("Yellow Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the yellow balance"),
+      "YellowDensity", N_("Yellow Density"), N_("Output Level Adjustment"),
+      N_("Adjust the yellow density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 3, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "BlackDensity", N_("Black Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the black balance"),
+      "BlackDensity", N_("Black Density"), N_("Output Level Adjustment"),
+      N_("Adjust the black density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 0, 1, 0
     }, 0.0, 2.0, 1.0, 1
diff --git a/src/main/print-color.c b/src/main/print-color.c
index b381667..b6ebb71 100644
--- a/src/main/print-color.c
+++ b/src/main/print-color.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-color.c,v 1.129 2005/06/30 01:45:19 rlk Exp $"
+ * "$Id: print-color.c,v 1.131 2005/07/04 00:23:54 rlk Exp $"
  *
  *   Gutenprint color management module - traditional Gutenprint algorithm.
  *
@@ -282,7 +282,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the red gamma"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 1, 1, 0
-    }, 0.0, 4.0, 1.0, CMASK_R, 1
+    }, 0.0, 1.0, 1.0, CMASK_R, 1
   },
   {
     {
@@ -308,6 +308,30 @@ static const float_param_t float_parameters[] =
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 3, 1, 0
     }, 0.0, 4.0, 1.0, CMASK_K, 1
   },
+  {
+    {
+      "CyanBalance", N_("Cyan Balance"), N_("GrayBalance"),
+      N_("Adjust the cyan gray balance"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 1, 1, 0
+    }, 0.0, 1.0, 1.0, CMASK_C, 1
+  },
+  {
+    {
+      "MagentaBalance", N_("Magenta Balance"), N_("GrayBalance"),
+      N_("Adjust the magenta gray balance"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 2, 1, 0
+    }, 0.0, 1.0, 1.0, CMASK_M, 1
+  },
+  {
+    {
+      "YellowBalance", N_("Yellow Balance"), N_("GrayBalance"),
+      N_("Adjust the yellow gray balance"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 3, 1, 0
+    }, 0.0, 1.0, 1.0, CMASK_Y, 1
+  },
   {
     {
       "Saturation", N_("Saturation"), N_("Basic Image Adjustment"),
@@ -701,7 +725,6 @@ copy_lut(void *vlut)
   stp_curve_cache_copy(&(dest->hue_map), &(src->hue_map));
   stp_curve_cache_copy(&(dest->lum_map), &(src->lum_map));
   stp_curve_cache_copy(&(dest->sat_map), &(src->sat_map));
-  stp_curve_cache_copy(&(dest->gcr_curve), &(src->gcr_curve));
   /* Don't copy gray_tmp */
   /* Don't copy cmy_tmp */
   if (src->in_data)
@@ -723,7 +746,6 @@ free_lut(void *vlut)
   stp_curve_free_curve_cache(&(lut->hue_map));
   stp_curve_free_curve_cache(&(lut->lum_map));
   stp_curve_free_curve_cache(&(lut->sat_map));
-  stp_curve_free_curve_cache(&(lut->gcr_curve));
   STP_SAFE_FREE(lut->gray_tmp);
   STP_SAFE_FREE(lut->cmy_tmp);
   STP_SAFE_FREE(lut->in_data);
@@ -799,29 +821,28 @@ static void
 initialize_gcr_curve(const stp_vars_t *vars)
 {
   lut_t *lut = (lut_t *)(stp_get_component_data(vars, "Color"));
-  if (!stp_curve_cache_get_curve(&(lut->gcr_curve)))
+  stp_curve_t *curve = NULL;
+  if (stp_check_curve_parameter(vars, "GCRCurve", STP_PARAMETER_DEFAULTED))
     {
-      if (stp_check_curve_parameter(vars, "GCRCurve", STP_PARAMETER_DEFAULTED))
+      double data;
+      size_t count;
+      int i;
+      curve = stp_curve_create_copy(stp_get_curve_parameter(vars, "GCRCurve"));
+      stp_curve_resample(curve, lut->steps);
+      count = stp_curve_count_points(curve);
+      stp_curve_set_bounds(curve, 0.0, 65535.0);
+      for (i = 0; i < count; i++)
 	{
-	  double data;
-	  size_t count;
-	  int i;
-	  stp_curve_t *curve =
-	    stp_curve_create_copy(stp_get_curve_parameter(vars, "GCRCurve"));
-	  stp_curve_resample(curve, lut->steps);
-	  count = stp_curve_count_points(curve);
-	  stp_curve_set_bounds(curve, 0.0, 65535.0);
-	  for (i = 0; i < count; i++)
-	    {
-	      stp_curve_get_point(curve, i, &data);
-	      data = 65535.0 * data * (double) i / (count - 1);
-	      stp_curve_set_point(curve, i, data);
-	    }
-	  stp_curve_cache_set_curve(&(lut->gcr_curve), curve);
+	  stp_curve_get_point(curve, i, &data);
+	  data = 65535.0 * data * (double) i / (count - 1);
+	  stp_curve_set_point(curve, i, data);
 	}
-      else
-	stp_curve_cache_set_curve(&(lut->gcr_curve), compute_gcr_curve(vars));
     }
+  else
+    curve = compute_gcr_curve(vars);
+  stp_channel_set_gcr_curve((stp_vars_t *)vars, curve);
+  if (curve)
+    stp_curve_destroy(curve);
 }
 
 /*
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 03f0cce..041bdf4 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.340 2005/06/30 00:12:14 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.341 2005/07/03 22:13:37 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -409,48 +409,48 @@ static const float_param_t float_parameters[] =
 {
   {
     {
-      "CyanDensity", N_("Cyan Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the cyan balance"),
+      "CyanDensity", N_("Cyan Density"), N_("Output Level Adjustment"),
+      N_("Adjust the cyan density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 1, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "MagentaDensity", N_("Magenta Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the magenta balance"),
+      "MagentaDensity", N_("Magenta Density"), N_("Output Level Adjustment"),
+      N_("Adjust the magenta density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 2, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "YellowDensity", N_("Yellow Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the yellow balance"),
+      "YellowDensity", N_("Yellow Density"), N_("Output Level Adjustment"),
+      N_("Adjust the yellow density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 3, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "BlackDensity", N_("Black Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the black balance"),
+      "BlackDensity", N_("Black Density"), N_("Output Level Adjustment"),
+      N_("Adjust the black density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 0, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "RedDensity", N_("Red Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the red balance"),
+      "RedDensity", N_("Red Density"), N_("Output Level Adjustment"),
+      N_("Adjust the red density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 4, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "BlueDensity", N_("Blue Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the blue balance"),
+      "BlueDensity", N_("Blue Density"), N_("Output Level Adjustment"),
+      N_("Adjust the blue density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 5, 1, 0
     }, 0.0, 2.0, 1.0, 1
@@ -1423,12 +1423,11 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	   strcmp(name, "CDYAdjustment") == 0)
     {
       const input_slot_t *slot = get_input_slot(v);
+      description->bounds.dimension.lower = -15;
+      description->bounds.dimension.upper = 15;
+      description->deflt.dimension = 0;
       if (printer_supports_print_to_cd(v) && (!slot || (slot && slot->is_cd)))
-	{
-	  description->bounds.dimension.lower = -15;
-	  description->bounds.dimension.upper = 15;
-	  description->deflt.dimension = 0;
-	}
+	description->is_active = 1;
       else
 	description->is_active = 0;
     }
@@ -2118,12 +2117,12 @@ adjust_print_quality(stp_vars_t *v, stp_image_t *image)
       k_lower = pt->k_lower;
       k_upper = pt->k_upper;
       k_transition = pt->k_transition;
-      stp_set_default_float_parameter(v, "CyanDensity", 1.0);
-      stp_scale_float_parameter(v, "CyanDensity", pt->cyan);
-      stp_set_default_float_parameter(v, "MagentaDensity", 1.0);
-      stp_scale_float_parameter(v, "MagentaDensity", pt->magenta);
-      stp_set_default_float_parameter(v, "YellowDensity", 1.0);
-      stp_scale_float_parameter(v, "YellowDensity", pt->yellow);
+      if (!stp_check_float_parameter(v, "CyanBalance", STP_PARAMETER_ACTIVE))
+	stp_set_float_parameter(v, "CyanBalance", pt->cyan);
+      if (!stp_check_float_parameter(v, "MagentaBalance", STP_PARAMETER_ACTIVE))
+	stp_set_float_parameter(v, "MagentaBalance", pt->magenta);
+      if (!stp_check_float_parameter(v, "YellowBalance", STP_PARAMETER_ACTIVE))
+	stp_set_float_parameter(v, "YellowBalance", pt->yellow);
       stp_set_default_float_parameter(v, "BlackDensity", 1.0);
       stp_scale_float_parameter(v, "BlackDensity", pt->black);
       stp_set_default_float_parameter(v, "Saturation", 1.0);
@@ -2132,7 +2131,6 @@ adjust_print_quality(stp_vars_t *v, stp_image_t *image)
       stp_scale_float_parameter(v, "Gamma", pt->gamma);
     }
 
-
   if (!stp_check_float_parameter(v, "GCRLower", STP_PARAMETER_ACTIVE))
     stp_set_default_float_parameter(v, "GCRLower", k_lower);
   if (!stp_check_float_parameter(v, "GCRUpper", STP_PARAMETER_ACTIVE))
@@ -2285,10 +2283,12 @@ setup_inks(stp_vars_t *v)
 		{
 		  stp_curve_t *curve_tmp =
 		    stp_curve_create_copy(channel->hue_curve->curve_impl);
+#if 0
 		  (void) stp_curve_rescale(curve_tmp,
 					   sqrt(1.0 / stp_get_float_parameter(v, "Gamma")),
 					   STP_CURVE_COMPOSE_EXPONENTIATE,
 					   STP_CURVE_BOUNDS_RESCALE);
+#endif
 		  stp_channel_set_curve(v, i, curve_tmp);
 		  stp_curve_destroy(curve_tmp);
 		}
diff --git a/src/main/print-lexmark.c b/src/main/print-lexmark.c
index 64d4075..b57233c 100644
--- a/src/main/print-lexmark.c
+++ b/src/main/print-lexmark.c
@@ -1,6 +1,6 @@
 
 /*
- * "$Id: print-lexmark.c,v 1.149 2005/05/08 03:10:38 rlk Exp $"
+ * "$Id: print-lexmark.c,v 1.150 2005/07/03 22:13:39 rlk Exp $"
  *
  *   Print plug-in Lexmark driver for the GIMP.
  *
@@ -322,32 +322,32 @@ static const float_param_t float_parameters[] =
 {
   {
     {
-      "CyanDensity", N_("Cyan Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the cyan balance"),
+      "CyanDensity", N_("Cyan Density"), N_("Output Level Adjustment"),
+      N_("Adjust the cyan density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 1, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "MagentaDensity", N_("Magenta Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the magenta balance"),
+      "MagentaDensity", N_("Magenta Density"), N_("Output Level Adjustment"),
+      N_("Adjust the magenta density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 2, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "YellowDensity", N_("Yellow Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the yellow balance"),
+      "YellowDensity", N_("Yellow Density"), N_("Output Level Adjustment"),
+      N_("Adjust the yellow density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 3, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "BlackDensity", N_("Black Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the black balance"),
+      "BlackDensity", N_("Black Density"), N_("Output Level Adjustment"),
+      N_("Adjust the black density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 0, 1, 0
     }, 0.0, 2.0, 1.0, 1
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index 4f558b8..e02b2bd 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-pcl.c,v 1.138 2005/05/08 03:10:39 rlk Exp $"
+ * "$Id: print-pcl.c,v 1.139 2005/07/03 22:13:39 rlk Exp $"
  *
  *   Print plug-in HP PCL driver for the GIMP.
  *
@@ -1215,32 +1215,32 @@ static const float_param_t float_parameters[] =
 {
   {
     {
-      "CyanDensity", N_("Cyan Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the cyan balance"),
+      "CyanDensity", N_("Cyan Density"), N_("Output Level Adjustment"),
+      N_("Adjust the cyan density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 1, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "MagentaDensity", N_("Magenta Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the magenta balance"),
+      "MagentaDensity", N_("Magenta Density"), N_("Output Level Adjustment"),
+      N_("Adjust the magenta density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 2, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "YellowDensity", N_("Yellow Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the yellow balance"),
+      "YellowDensity", N_("Yellow Density"), N_("Output Level Adjustment"),
+      N_("Adjust the yellow density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 3, 1, 0
     }, 0.0, 2.0, 1.0, 1
   },
   {
     {
-      "BlackDensity", N_("Black Balance"), N_("Output Level Adjustment"),
-      N_("Adjust the black balance"),
+      "BlackDensity", N_("Black Density"), N_("Output Level Adjustment"),
+      N_("Adjust the black density"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 0, 1, 0
     }, 0.0, 2.0, 1.0, 1
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index 856b313..0bb1ead 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -296,7 +296,6 @@ 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@
diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
index 6ad6563..42b0696 100644
--- a/src/testpattern/testpatternl.c
+++ b/src/testpattern/testpatternl.c
@@ -1,85 +1,32 @@
-
-#line 3 "testpatternl.c"
-
-#define  YY_INT_ALIGNED short int
-
 /* A lexical scanner generated by flex */
 
+/* Scanner skeleton version:
+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ */
+
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 31
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
 
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
 #include 
-#include 
-#include 
-#include 
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
 
-/* C99 systems have . Non-C99 systems may or may not. */
 
-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#include 
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
 #endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
 
+#include 
+#include 
+
+/* Use prototypes in function declarations. */
+#define YY_USE_PROTOS
+
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
@@ -87,17 +34,34 @@ typedef unsigned int flex_uint32_t;
 
 #if __STDC__
 
+#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
+#ifdef __TURBOC__
+ #pragma warn -rch
+ #pragma warn -use
+#include 
+#include 
+#define YY_USE_CONST
+#define YY_USE_PROTOS
+#endif
+
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
+
+#ifdef YY_USE_PROTOS
+#define YY_PROTO(proto) proto
+#else
+#define YY_PROTO(proto) ()
+#endif
+
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -112,71 +76,71 @@ typedef unsigned int flex_uint32_t;
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN (yy_start) = 1 + 2 *
+#define BEGIN yy_start = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START (((yy_start) - 1) / 2)
+#define YY_START ((yy_start - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
+#define YY_NEW_FILE yyrestart( yyin )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
-#endif
 
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
 
 extern int yyleng;
-
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
+/* The funky do-while in the following #define is used to turn the definition
+ * int a single C statement (which needs a semi-colon terminator).  This
+ * avoids problems with code like:
+ *
+ * 	if ( condition_holds )
+ *		yyless( 5 );
+ *	else
+ *		do_something_else();
+ *
+ * Prior to using the do-while the compiler would get upset at the
+ * "else" because it interpreted the "if" statement as being all
+ * done when it reached the ';' after the yyless() call.
+ */
+
+/* Return all but the first 'n' matched characters back to the input stream. */
+
 #define yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
+		*yy_cp = yy_hold_char; \
 		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, (yytext_ptr)  )
+#define unput(c) yyunput( c, yytext_ptr )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
 typedef unsigned int yy_size_t;
-#endif
 
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
+
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -213,16 +177,12 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
-
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -236,33 +196,23 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-
 	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE yy_current_buffer = 0;
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
- *
- * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
+#define YY_CURRENT_BUFFER yy_current_buffer
 
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
+
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+
+
 int yyleng;
 
 /* Points to current character in buffer. */
@@ -275,93 +225,69 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+void yyrestart YY_PROTO(( FILE *input_file ));
 
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
+void yy_load_buffer_state YY_PROTO(( void ));
+YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
+void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
+void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
 
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
+YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
+YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
+YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
 
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
+static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
 
-#define yywrap(n) 1
-#define YY_SKIP_YYWRAP
 
+#define yywrap() 1
+#define YY_SKIP_YYWRAP
 typedef unsigned char YY_CHAR;
-
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
 typedef int yy_state_type;
-
-extern int yylineno;
-
-int yylineno = 1;
-
 extern char *yytext;
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
+static yy_state_type yy_get_previous_state YY_PROTO(( void ));
+static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
+static int yy_get_next_buffer YY_PROTO(( void ));
+static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
+	yytext_ptr = yy_bp; \
+	yyleng = (int) (yy_cp - yy_bp); \
+	yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
+	yy_c_buf_p = yy_cp;
 
 #define YY_NUM_RULES 49
 #define YY_END_OF_BUFFER 50
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept[233] =
+static yyconst short int yy_accept[233] =
     {   0,
         0,    0,   50,   49,   46,   48,   49,   47,   49,   49,
        43,   32,   45,   45,   45,   45,   45,   45,   45,   45,
@@ -391,7 +317,7 @@ static yyconst flex_int16_t yy_accept[233] =
        16,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -423,7 +349,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[38] =
+static yyconst int yy_meta[38] =
     {   0,
         1,    1,    2,    3,    1,    1,    1,    4,    4,    4,
         1,    4,    4,    4,    4,    4,    4,    4,    4,    4,
@@ -431,7 +357,7 @@ static yyconst flex_int32_t yy_meta[38] =
         4,    4,    4,    4,    4,    4,    4
     } ;
 
-static yyconst flex_int16_t yy_base[237] =
+static yyconst short int yy_base[237] =
     {   0,
         0,    0,  468,  469,  465,  469,    0,    0,  460,  455,
        29,  469,  455,   31,   32,   33,   34,   35,   40,   47,
@@ -461,7 +387,7 @@ static yyconst flex_int16_t yy_base[237] =
       343,  469,  412,  416,  420,  115
     } ;
 
-static yyconst flex_int16_t yy_def[237] =
+static yyconst short int yy_def[237] =
     {   0,
       232,    1,  232,  232,  232,  232,  233,  234,  235,  232,
       236,  232,  236,  236,  236,  236,  236,  236,  236,  236,
@@ -491,7 +417,7 @@ static yyconst flex_int16_t yy_def[237] =
       236,    0,  232,  232,  232,  232
     } ;
 
-static yyconst flex_int16_t yy_nxt[507] =
+static yyconst short int yy_nxt[507] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        12,   13,   13,   14,   15,   16,   17,   13,   18,   19,
@@ -551,7 +477,7 @@ static yyconst flex_int16_t yy_nxt[507] =
       232,  232,  232,  232,  232,  232
     } ;
 
-static yyconst flex_int16_t yy_chk[507] =
+static yyconst short int yy_chk[507] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -614,9 +540,6 @@ static yyconst flex_int16_t yy_chk[507] =
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
  */
@@ -626,6 +549,7 @@ int yy_flex_debug = 0;
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "testpatternl.l"
+#define INITIAL 0
 /*
  * "$Id: testpatternl.l,v 1.16 2004/04/14 02:21:21 rlk Exp $"
  *
@@ -687,21 +611,7 @@ do							\
  while (0)
 
 
-#line 691 "testpatternl.c"
-
-#define INITIAL 0
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include 
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
+#line 615 "testpatternl.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -709,30 +619,65 @@ do							\
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap YY_PROTO(( void ));
 #else
-extern int yywrap (void );
+extern int yywrap YY_PROTO(( void ));
 #endif
 #endif
 
-    static void yyunput (int c,char *buf_ptr  );
-    
+#ifndef YY_NO_UNPUT
+static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+#endif
+
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput YY_PROTO(( void ));
+#else
+static int input YY_PROTO(( void ));
+#endif
+#endif
+
+#if YY_STACK_USED
+static int yy_start_stack_ptr = 0;
+static int yy_start_stack_depth = 0;
+static int *yy_start_stack = 0;
+#ifndef YY_NO_PUSH_STATE
+static void yy_push_state YY_PROTO(( int new_state ));
+#endif
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state YY_PROTO(( void ));
+#endif
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state YY_PROTO(( void ));
+#endif
+
 #else
-static int input (void );
+#define YY_NO_PUSH_STATE 1
+#define YY_NO_POP_STATE 1
+#define YY_NO_TOP_STATE 1
 #endif
 
+#ifdef YY_MALLOC_DECL
+YY_MALLOC_DECL
+#else
+#if __STDC__
+#ifndef __cplusplus
+#include 
+#endif
+#else
+/* Just try to get by without declaring the routines.  This will fail
+ * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
+ * or sizeof(void*) != sizeof(int).
+ */
+#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */
@@ -741,6 +686,7 @@ static int input (void );
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
+
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
@@ -753,10 +699,9 @@ static int input (void );
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+	if ( yy_current_buffer->yy_is_interactive ) \
 		{ \
-		int c = '*'; \
-		size_t n; \
+		int c = '*', n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -766,22 +711,9 @@ static int input (void );
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
+	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+		  && ferror( yyin ) ) \
+		YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -802,18 +734,12 @@ static int input (void );
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
-/* end tables serialization structures and prototypes */
-
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
+#define YY_DECL int yylex YY_PROTO(( void ))
+#endif
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -830,29 +756,27 @@ extern int yylex (void);
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
-/** The main scanner function which does all the work.
- */
 YY_DECL
-{
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-    
+
 #line 73 "testpatternl.l"
 
 
-#line 845 "testpatternl.c"
+#line 769 "testpatternl.c"
 
-	if ( (yy_init) )
+	if ( yy_init )
 		{
-		(yy_init) = 0;
+		yy_init = 0;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
+		if ( ! yy_start )
+			yy_start = 1;	/* first start state */
 
 		if ( ! yyin )
 			yyin = stdin;
@@ -860,36 +784,34 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
+		if ( ! yy_current_buffer )
+			yy_current_buffer =
+				yy_create_buffer( yyin, YY_BUF_SIZE );
 
-		yy_load_buffer_state( );
+		yy_load_buffer_state();
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = (yy_c_buf_p);
+		yy_cp = yy_c_buf_p;
 
 		/* Support of yytext. */
-		*yy_cp = (yy_hold_char);
+		*yy_cp = yy_hold_char;
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = (yy_start);
+		yy_current_state = yy_start;
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
+				yy_last_accepting_state = yy_current_state;
+				yy_last_accepting_cpos = yy_cp;
 				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
@@ -906,22 +828,24 @@ yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
+			yy_cp = yy_last_accepting_cpos;
+			yy_current_state = yy_last_accepting_state;
 			yy_act = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
+
 do_action:	/* This label is used only to access EOF actions. */
 
+
 		switch ( yy_act )
 	{ /* beginning of action switch */
 			case 0: /* must back up */
 			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
+			*yy_cp = yy_hold_char;
+			yy_cp = yy_last_accepting_cpos;
+			yy_current_state = yy_last_accepting_state;
 			goto yy_find_action;
 
 case 1:
@@ -1145,7 +1069,6 @@ YY_RULE_SETUP
 yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 45:
-/* rule 45 can match eol */
 YY_RULE_SETUP
 #line 121 "testpatternl.l"
 yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
@@ -1161,7 +1084,6 @@ YY_RULE_SETUP
 DBG(comment); 	/* Skip comments */
 	YY_BREAK
 case 48:
-/* rule 48 can match eol */
 YY_RULE_SETUP
 #line 124 "testpatternl.l"
 DBG(newline); mylineno++;
@@ -1171,33 +1093,33 @@ YY_RULE_SETUP
 #line 125 "testpatternl.l"
 ECHO;
 	YY_BREAK
-#line 1175 "testpatternl.c"
+#line 1097 "testpatternl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
+		*yy_cp = yy_hold_char;
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
 			 * just pointed yyin at a new source and called
 			 * yylex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
+			 * consistency between yy_current_buffer and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			yy_n_chars = yy_current_buffer->yy_n_chars;
+			yy_current_buffer->yy_input_file = yyin;
+			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1207,13 +1129,13 @@ case YY_STATE_EOF(INITIAL):
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state(  );
+			yy_current_state = yy_get_previous_state();
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -1226,30 +1148,30 @@ case YY_STATE_EOF(INITIAL):
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+			yy_bp = yytext_ptr + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
+				yy_cp = ++yy_c_buf_p;
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = (yy_c_buf_p);
+				yy_cp = yy_c_buf_p;
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer(  ) )
+		else switch ( yy_get_next_buffer() )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				(yy_did_buffer_switch_on_eof) = 0;
+				yy_did_buffer_switch_on_eof = 0;
 
-				if ( yywrap( ) )
+				if ( yywrap() )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
@@ -1260,7 +1182,7 @@ case YY_STATE_EOF(INITIAL):
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -1268,30 +1190,30 @@ case YY_STATE_EOF(INITIAL):
 
 				else
 					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
+					if ( ! yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
+				yy_c_buf_p =
+					yytext_ptr + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state(  );
+				yy_current_state = yy_get_previous_state();
 
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				yy_cp = yy_c_buf_p;
+				yy_bp = yytext_ptr + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+				yy_c_buf_p =
+				&yy_current_buffer->yy_ch_buf[yy_n_chars];
 
-				yy_current_state = yy_get_previous_state(  );
+				yy_current_state = yy_get_previous_state();
 
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				yy_cp = yy_c_buf_p;
+				yy_bp = yytext_ptr + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -1302,7 +1224,8 @@ case YY_STATE_EOF(INITIAL):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-} /* end of yylex */
+	} /* end of yylex */
+
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1311,20 +1234,21 @@ case YY_STATE_EOF(INITIAL):
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-static int yy_get_next_buffer (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
+
+static int yy_get_next_buffer()
+	{
+	register char *dest = yy_current_buffer->yy_ch_buf;
+	register char *source = yytext_ptr;
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+	if ( yy_current_buffer->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -1344,30 +1268,34 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
 
 	else
 		{
-			size_t num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+		int num_to_read =
+			yy_current_buffer->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
+#ifdef YY_USES_REJECT
+			YY_FATAL_ERROR(
+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+#else
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+			YY_BUFFER_STATE b = yy_current_buffer;
 
 			int yy_c_buf_p_offset =
-				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+				(int) (yy_c_buf_p - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
@@ -1380,7 +1308,8 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yy_flex_realloc( (void *) b->yy_ch_buf,
+							 b->yy_buf_size + 2 );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1390,35 +1319,35 @@ static int yy_get_next_buffer (void)
 				YY_FATAL_ERROR(
 				"fatal error - scanner input buffer overflow" );
 
-			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+			num_to_read = yy_current_buffer->yy_buf_size -
 						number_to_move - 1;
-
+#endif
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
+			yy_n_chars, num_to_read );
 
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		yy_current_buffer->yy_n_chars = yy_n_chars;
 		}
 
-	if ( (yy_n_chars) == 0 )
+	if ( yy_n_chars == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart(yyin  );
+			yyrestart( yyin );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+			yy_current_buffer->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1426,31 +1355,32 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+	yy_n_chars += number_to_move;
+	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
 
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
 
 	return ret_val;
-}
+	}
+
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-    static yy_state_type yy_get_previous_state (void)
-{
+static yy_state_type yy_get_previous_state()
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
 
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+	yy_current_state = yy_start;
+
+	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
-			(yy_last_accepting_state) = yy_current_state;
-			(yy_last_accepting_cpos) = yy_cp;
+			yy_last_accepting_state = yy_current_state;
+			yy_last_accepting_cpos = yy_cp;
 			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
@@ -1462,23 +1392,30 @@ static int yy_get_next_buffer (void)
 		}
 
 	return yy_current_state;
-}
+	}
+
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
+
+#ifdef YY_USE_PROTOS
+static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
+#else
+static yy_state_type yy_try_NUL_trans( yy_current_state )
+yy_state_type yy_current_state;
+#endif
+	{
 	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
+	register char *yy_cp = yy_c_buf_p;
 
 	register YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
-		(yy_last_accepting_state) = yy_current_state;
-		(yy_last_accepting_cpos) = yy_cp;
+		yy_last_accepting_state = yy_current_state;
+		yy_last_accepting_cpos = yy_cp;
 		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
@@ -1490,73 +1427,80 @@ static int yy_get_next_buffer (void)
 	yy_is_jam = (yy_current_state == 232);
 
 	return yy_is_jam ? 0 : yy_current_state;
-}
+	}
 
-    static void yyunput (int c, register char * yy_bp )
-{
-	register char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
+
+#ifndef YY_NO_UNPUT
+#ifdef YY_USE_PROTOS
+static void yyunput( int c, register char *yy_bp )
+#else
+static void yyunput( c, yy_bp )
+int c;
+register char *yy_bp;
+#endif
+	{
+	register char *yy_cp = yy_c_buf_p;
 
 	/* undo effects of setting up yytext */
-	*yy_cp = (yy_hold_char);
+	*yy_cp = yy_hold_char;
 
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = (yy_n_chars) + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register int number_to_move = yy_n_chars + 2;
+		register char *dest = &yy_current_buffer->yy_ch_buf[
+					yy_current_buffer->yy_buf_size + 2];
 		register char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+				&yy_current_buffer->yy_ch_buf[number_to_move];
 
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+		while ( source > yy_current_buffer->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+		yy_current_buffer->yy_n_chars =
+			yy_n_chars = yy_current_buffer->yy_buf_size;
 
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
-	(yytext_ptr) = yy_bp;
-	(yy_hold_char) = *yy_cp;
-	(yy_c_buf_p) = yy_cp;
-}
 
-#ifndef YY_NO_INPUT
+	yytext_ptr = yy_bp;
+	yy_hold_char = *yy_cp;
+	yy_c_buf_p = yy_cp;
+	}
+#endif	/* ifndef YY_NO_UNPUT */
+
+
 #ifdef __cplusplus
-    static int yyinput (void)
+static int yyinput()
 #else
-    static int input  (void)
+static int input()
 #endif
-
-{
+	{
 	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+	*yy_c_buf_p = yy_hold_char;
+
+	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
 			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
+			*yy_c_buf_p = '\0';
 
 		else
 			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
+			int offset = yy_c_buf_p - yytext_ptr;
+			++yy_c_buf_p;
 
-			switch ( yy_get_next_buffer(  ) )
+			switch ( yy_get_next_buffer() )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -1570,16 +1514,16 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					yyrestart(yyin );
+					yyrestart( yyin );
 
-					/*FALLTHROUGH*/
+					/* fall through */
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap( ) )
+					if ( yywrap() )
 						return EOF;
 
-					if ( ! (yy_did_buffer_switch_on_eof) )
+					if ( ! yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -1589,92 +1533,90 @@ static int yy_get_next_buffer (void)
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
+					yy_c_buf_p = yytext_ptr + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve yytext */
-	(yy_hold_char) = *++(yy_c_buf_p);
+	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
+	*yy_c_buf_p = '\0';	/* preserve yytext */
+	yy_hold_char = *++yy_c_buf_p;
+
 
 	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
+	}
 
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void yyrestart  (FILE * input_file )
-{
-    
-	if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
+
+#ifdef YY_USE_PROTOS
+void yyrestart( FILE *input_file )
+#else
+void yyrestart( input_file )
+FILE *input_file;
+#endif
+	{
+	if ( ! yy_current_buffer )
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+
+	yy_init_buffer( yy_current_buffer, input_file );
+	yy_load_buffer_state();
 	}
 
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
 
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-    
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
-     */
-	yyensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
+#ifdef YY_USE_PROTOS
+void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
+#else
+void yy_switch_to_buffer( new_buffer )
+YY_BUFFER_STATE new_buffer;
+#endif
+	{
+	if ( yy_current_buffer == new_buffer )
 		return;
 
-	if ( YY_CURRENT_BUFFER )
+	if ( yy_current_buffer )
 		{
 		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		*yy_c_buf_p = yy_hold_char;
+		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
+		yy_current_buffer->yy_n_chars = yy_n_chars;
 		}
 
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
+	yy_current_buffer = new_buffer;
+	yy_load_buffer_state();
 
 	/* We don't actually know whether we did this switch during
 	 * EOF (yywrap()) processing, but the only time this flag
 	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
+	yy_did_buffer_switch_on_eof = 1;
+	}
 
-static void yy_load_buffer_state  (void)
-{
-    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
 
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
-{
+#ifdef YY_USE_PROTOS
+void yy_load_buffer_state( void )
+#else
+void yy_load_buffer_state()
+#endif
+	{
+	yy_n_chars = yy_current_buffer->yy_n_chars;
+	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
+	yyin = yy_current_buffer->yy_input_file;
+	yy_hold_char = *yy_c_buf_p;
+	}
+
+
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
+#else
+YY_BUFFER_STATE yy_create_buffer( file, size )
+FILE *file;
+int size;
+#endif
+	{
 	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1683,75 +1625,80 @@ static void yy_load_buffer_state  (void)
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer(b,file );
+	yy_init_buffer( b, file );
 
 	return b;
-}
+	}
 
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
+
+#ifdef YY_USE_PROTOS
+void yy_delete_buffer( YY_BUFFER_STATE b )
+#else
+void yy_delete_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+	{
 	if ( ! b )
 		return;
 
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+	if ( b == yy_current_buffer )
+		yy_current_buffer = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
+		yy_flex_free( (void *) b->yy_ch_buf );
 
-	yyfree((void *) b  );
-}
+	yy_flex_free( (void *) b );
+	}
 
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-{
-	int oerrno = errno;
-    
-	yy_flush_buffer(b );
+#ifndef YY_ALWAYS_INTERACTIVE
+#ifndef YY_NEVER_INTERACTIVE
+#include
+#endif
+#endif
+
+#ifdef YY_USE_PROTOS
+void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
+#else
+void yy_init_buffer( b, file )
+YY_BUFFER_STATE b;
+FILE *file;
+#endif
+
+
+	{
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
+#if YY_ALWAYS_INTERACTIVE
+	b->yy_is_interactive = 1;
+#else
+#if YY_NEVER_INTERACTIVE
+	b->yy_is_interactive = 0;
+#else
+	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+#endif
+#endif
+	}
 
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-	errno = oerrno;
-}
 
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
-{
-    	if ( ! b )
+#ifdef YY_USE_PROTOS
+void yy_flush_buffer( YY_BUFFER_STATE b )
+#else
+void yy_flush_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+
+	{
+	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1768,121 +1715,29 @@ extern int isatty (int );
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-    	if (new_buffer == NULL)
-		return;
-
-	yyensure_buffer_stack();
-
-	/* This block is copied from yy_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-void yypop_buffer_state (void)
-{
-    	if (!YY_CURRENT_BUFFER)
-		return;
-
-	yy_delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
-	int num_to_alloc;
-    
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
+	if ( b == yy_current_buffer )
+		yy_load_buffer_state();
 	}
 
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
-{
+#ifndef YY_NO_SCAN_BUFFER
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
+#else
+YY_BUFFER_STATE yy_scan_buffer( base, size )
+char *base;
+yy_size_t size;
+#endif
+	{
 	YY_BUFFER_STATE b;
-    
+
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -1896,42 +1751,47 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer(b  );
+	yy_switch_to_buffer( b );
 
 	return b;
-}
+	}
+#endif
 
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
-{
-    
-	return yy_scan_bytes(yy_str,strlen(yy_str) );
-}
 
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
-{
+#ifndef YY_NO_SCAN_STRING
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
+#else
+YY_BUFFER_STATE yy_scan_string( yy_str )
+yyconst char *yy_str;
+#endif
+	{
+	int len;
+	for ( len = 0; yy_str[len]; ++len )
+		;
+
+	return yy_scan_bytes( yy_str, len );
+	}
+#endif
+
+
+#ifndef YY_NO_SCAN_BYTES
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
+#else
+YY_BUFFER_STATE yy_scan_bytes( bytes, len )
+yyconst char *bytes;
+int len;
+#endif
+	{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-    
+
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = len + 2;
-	buf = (char *) yyalloc(n  );
+	buf = (char *) yy_flex_alloc( n );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -1940,7 +1800,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
 
 	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer(buf,n );
+	b = yy_scan_buffer( buf, n );
 	if ( ! b )
 		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
@@ -1950,164 +1810,148 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
 	b->yy_is_our_buffer = 1;
 
 	return b;
-}
+	}
+#endif
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
+
+#ifndef YY_NO_PUSH_STATE
+#ifdef YY_USE_PROTOS
+static void yy_push_state( int new_state )
+#else
+static void yy_push_state( new_state )
+int new_state;
 #endif
+	{
+	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+		{
+		yy_size_t new_size;
 
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
+		yy_start_stack_depth += YY_START_STACK_INCR;
+		new_size = yy_start_stack_depth * sizeof( int );
 
-/* Redefine yyless() so it works in section 3 code. */
+		if ( ! yy_start_stack )
+			yy_start_stack = (int *) yy_flex_alloc( new_size );
 
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = (yy_hold_char); \
-		(yy_c_buf_p) = yytext + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
+		else
+			yy_start_stack = (int *) yy_flex_realloc(
+					(void *) yy_start_stack, new_size );
 
-/* Accessor  methods (get/set functions) to struct members. */
+		if ( ! yy_start_stack )
+			YY_FATAL_ERROR(
+			"out of memory expanding start-condition stack" );
+		}
 
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
+	yy_start_stack[yy_start_stack_ptr++] = YY_START;
 
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
+	BEGIN(new_state);
+	}
+#endif
 
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
 
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state()
+	{
+	if ( --yy_start_stack_ptr < 0 )
+		YY_FATAL_ERROR( "start-condition stack underflow" );
 
-/** Get the current token.
- * 
- */
+	BEGIN(yy_start_stack[yy_start_stack_ptr]);
+	}
+#endif
 
-char *yyget_text  (void)
-{
-        return yytext;
-}
 
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state()
+	{
+	return yy_start_stack[yy_start_stack_ptr - 1];
+	}
+#endif
 
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  in_str )
-{
-        yyin = in_str ;
-}
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
 
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_str ;
-}
+#ifdef YY_USE_PROTOS
+static void yy_fatal_error( yyconst char msg[] )
+#else
+static void yy_fatal_error( msg )
+char msg[];
+#endif
+	{
+	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+	}
 
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
 
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
 
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer(YY_CURRENT_BUFFER  );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state();
-	}
+/* Redefine yyless() so it works in section 3 code. */
 
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+		yytext[yyleng] = yy_hold_char; \
+		yy_c_buf_p = yytext + n; \
+		yy_hold_char = *yy_c_buf_p; \
+		*yy_c_buf_p = '\0'; \
+		yyleng = n; \
+		} \
+	while ( 0 )
 
-    return 0;
-}
 
-/*
- * Internal utility routines.
- */
+/* Internal utility routines. */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
+#ifdef YY_USE_PROTOS
+static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
+#else
+static void yy_flex_strncpy( s1, s2, n )
+char *s1;
+yyconst char *s2;
+int n;
+#endif
+	{
 	register int i;
-    	for ( i = 0; i < n; ++i )
+	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-}
+	}
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
+#ifdef YY_USE_PROTOS
+static int yy_flex_strlen( yyconst char *s )
+#else
+static int yy_flex_strlen( s )
+yyconst char *s;
+#endif
+	{
 	register int n;
-    	for ( n = 0; s[n]; ++n )
+	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-}
+	}
 #endif
 
-void *yyalloc (yy_size_t  size )
-{
+
+#ifdef YY_USE_PROTOS
+static void *yy_flex_alloc( yy_size_t size )
+#else
+static void *yy_flex_alloc( size )
+yy_size_t size;
+#endif
+	{
 	return (void *) malloc( size );
-}
+	}
 
-void *yyrealloc  (void * ptr, yy_size_t  size )
-{
+#ifdef YY_USE_PROTOS
+static void *yy_flex_realloc( void *ptr, yy_size_t size )
+#else
+static void *yy_flex_realloc( ptr, size )
+void *ptr;
+yy_size_t size;
+#endif
+	{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -2116,25 +1960,23 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
+	}
 
-#undef YY_NEW_FILE
-#undef YY_FLUSH_BUFFER
-#undef yy_set_bol
-#undef yy_new_buffer
-#undef yy_set_interactive
-#undef yytext_ptr
-#undef YY_DO_BEFORE_ACTION
+#ifdef YY_USE_PROTOS
+static void yy_flex_free( void *ptr )
+#else
+static void yy_flex_free( ptr )
+void *ptr;
+#endif
+	{
+	free( ptr );
+	}
 
-#ifdef YY_DECL_IS_OURS
-#undef YY_DECL_IS_OURS
-#undef YY_DECL
+#if YY_MAIN
+int main()
+	{
+	yylex();
+	return 0;
+	}
 #endif
 #line 125 "testpatternl.l"
diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
index 073282d..ede6285 100644
--- a/src/testpattern/testpatterny.c
+++ b/src/testpattern/testpatterny.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -241,29 +241,22 @@ typedef int YYSTYPE;
 
 
 /* Line 214 of yacc.c.  */
-#line 245 "testpatterny.c"
+#line 244 "testpatterny.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
-# ifndef YYFREE
-#  define YYFREE free
-# endif
-# ifndef YYMALLOC
-#  define YYMALLOC malloc
-# endif
-
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   define YYSTACK_ALLOC alloca
-#  endif
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
 # else
-#  if defined (alloca) || defined (_ALLOCA_H)
-#   define YYSTACK_ALLOC alloca
-#  else
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
 #   endif
 #  endif
 # endif
@@ -276,20 +269,20 @@ typedef int YYSTYPE;
 #   include  /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T size_t
 #  endif
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+	 || (YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  short yyss;
   YYSTYPE yyvs;
   };
 
@@ -299,13 +292,13 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
@@ -341,7 +334,7 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short int yysigned_char;
+   typedef short yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
@@ -404,7 +397,7 @@ static const unsigned char yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short int yyprhs[] =
+static const unsigned short yyprhs[] =
 {
        0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
       19,    22,    25,    28,    31,    34,    37,    41,    43,    45,
@@ -457,7 +450,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const unsigned short yyrline[] =
 {
        0,   139,   139,   139,   139,   139,   140,   140,   140,   140,
      143,   155,   167,   179,   191,   203,   215,   227,   227,   227,
@@ -479,33 +472,33 @@ static const unsigned short int yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "CYAN",
-  "L_CYAN", "MAGENTA", "L_MAGENTA", "YELLOW", "D_YELLOW", "BLACK",
-  "L_BLACK", "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER",
-  "PARAMETER", "PARAMETER_INT", "PARAMETER_FLOAT", "PARAMETER_CURVE",
-  "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "PATTERN",
-  "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL", "CMYK",
-  "KCMY", "RGB", "CMY", "GRAY", "WHITE", "RAW", "MODE", "PAGESIZE",
-  "MESSAGE", "END", "$accept", "COLOR", "cmykspec", "kcmyspec", "rgbspec",
-  "cmyspec", "grayspec", "whitespec", "extendedspec", "modespec",
-  "inputspec", "level", "channel_level", "gamma", "channel_gamma",
-  "global_gamma", "steps", "ink_limit", "printer", "page_size_name",
-  "page_size_custom", "page_size", "parameter_string", "parameter_int",
-  "parameter_float", "parameter", "density", "top", "left", "hsize",
-  "vsize", "blackline", "color_block1", "color_blocks1a", "color_blocks1b",
-  "color_blocks1", "color_block2a", "color_block2b", "color_block2",
-  "color_blocks2a", "color_blocks2", "color_blocks", "patvars", "pattern",
-  "xpattern", "grid", "image", "Message0", "Message1", "Message2",
-  "Message3", "Message4", "A_Message", "message", "A_Rule", "Rule",
-  "A_Pattern", "Pattern", "Patterns", "Image", "Rules", "Output", "EOF",
-  "Thing", "@1", 0
+  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "CYAN", 
+  "L_CYAN", "MAGENTA", "L_MAGENTA", "YELLOW", "D_YELLOW", "BLACK", 
+  "L_BLACK", "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER", 
+  "PARAMETER", "PARAMETER_INT", "PARAMETER_FLOAT", "PARAMETER_CURVE", 
+  "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "PATTERN", 
+  "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL", "CMYK", 
+  "KCMY", "RGB", "CMY", "GRAY", "WHITE", "RAW", "MODE", "PAGESIZE", 
+  "MESSAGE", "END", "$accept", "COLOR", "cmykspec", "kcmyspec", "rgbspec", 
+  "cmyspec", "grayspec", "whitespec", "extendedspec", "modespec", 
+  "inputspec", "level", "channel_level", "gamma", "channel_gamma", 
+  "global_gamma", "steps", "ink_limit", "printer", "page_size_name", 
+  "page_size_custom", "page_size", "parameter_string", "parameter_int", 
+  "parameter_float", "parameter", "density", "top", "left", "hsize", 
+  "vsize", "blackline", "color_block1", "color_blocks1a", 
+  "color_blocks1b", "color_blocks1", "color_block2a", "color_block2b", 
+  "color_block2", "color_blocks2a", "color_blocks2", "color_blocks", 
+  "patvars", "pattern", "xpattern", "grid", "image", "Message0", 
+  "Message1", "Message2", "Message3", "Message4", "A_Message", "message", 
+  "A_Rule", "Rule", "A_Pattern", "Pattern", "Patterns", "Image", "Rules", 
+  "Output", "EOF", "Thing", "@1", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
+static const unsigned short yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -574,7 +567,7 @@ static const unsigned char yydefact[] =
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
+static const short yydefgoto[] =
 {
       -1,   137,    85,    86,    87,    88,    89,    90,    91,    92,
       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
@@ -588,7 +581,7 @@ static const short int yydefgoto[] =
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 #define YYPACT_NINF -131
-static const short int yypact[] =
+static const short yypact[] =
 {
     -131,   -14,    16,    56,    41,    25,    36,    38,    53,    66,
       67,    69,    70,    77,    78,    79,    81,    39,    22,    80,
@@ -610,7 +603,7 @@ static const short int yypact[] =
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short int yypgoto[] =
+static const short yypgoto[] =
 {
     -131,    52,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
     -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
@@ -708,8 +701,7 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
+#define YYERROR		goto yyerrlab1
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -743,11 +735,11 @@ while (0)
    are run).  */
 
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)		\
-   ((Current).first_line   = (Rhs)[1].first_line,	\
-    (Current).first_column = (Rhs)[1].first_column,	\
-    (Current).last_line    = (Rhs)[N].last_line,	\
-    (Current).last_column  = (Rhs)[N].last_column)
+# define YYLLOC_DEFAULT(Current, Rhs, N)         \
+  Current.first_line   = Rhs[1].first_line;      \
+  Current.first_column = Rhs[1].first_column;    \
+  Current.last_line    = Rhs[N].last_line;       \
+  Current.last_column  = Rhs[N].last_column;
 #endif
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
@@ -791,17 +783,17 @@ do {								\
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
+| TOP (cinluded).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (short *bottom, short *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+    short *bottom;
+    short *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -831,9 +823,9 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned int yylno = yyrline[yyrule];
+  unsigned int yylineno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylno);
+             yyrule - 1, yylineno);
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
     YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
@@ -870,7 +862,7 @@ int yydebug;
    SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+#if YYMAXDEPTH == 0
 # undef YYMAXDEPTH
 #endif
 
@@ -1068,9 +1060,9 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  register short int *yyssp;
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
@@ -1107,7 +1099,6 @@ yyparse ()
   yyssp = yyss;
   yyvsp = yyvs;
 
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1133,7 +1124,7 @@ yyparse ()
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
@@ -1161,7 +1152,7 @@ yyparse ()
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	short *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
@@ -1755,8 +1746,8 @@ yyreduce:
 
     }
 
-/* Line 1010 of yacc.c.  */
-#line 1760 "testpatterny.c"
+/* Line 991 of yacc.c.  */
+#line 1750 "testpatterny.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1797,33 +1788,18 @@ yyerrlab:
 	{
 	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
-	  const char* yyprefix;
 	  char *yymsg;
-	  int yyx;
+	  int yyx, yycount;
 
+	  yycount = 0;
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 0;
-
-	  yyprefix = ", expecting ";
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      {
-		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-		yycount += 1;
-		if (yycount == 5)
-		  {
-		    yysize = 0;
-		    break;
-		  }
-	      }
-	  yysize += (sizeof ("syntax error, unexpected ")
-		     + yystrlen (yytname[yytype]));
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("syntax error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[yytype]);
 	  yymsg = (char *) YYSTACK_ALLOC (yysize);
 	  if (yymsg != 0)
 	    {
@@ -1832,13 +1808,16 @@ yyerrlab:
 
 	      if (yycount < 5)
 		{
-		  yyprefix = ", expecting ";
-		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+		  yycount = 0;
+		  for (yyx = yyn < 0 ? -yyn : 0;
+		       yyx < (int) (sizeof (yytname) / sizeof (char *));
+		       yyx++)
 		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		      {
-			yyp = yystpcpy (yyp, yyprefix);
+			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyq);
 			yyp = yystpcpy (yyp, yytname[yyx]);
-			yyprefix = " or ";
+			yycount++;
 		      }
 		}
 	      yyerror (yymsg);
@@ -1859,56 +1838,52 @@ yyerrlab:
       /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      if (yychar <= YYEOF)
+      /* Return failure if at end of input.  */
+      if (yychar == YYEOF)
         {
-          /* If at end of input, pop the error token,
-	     then the rest of the stack, then return failure.  */
-	  if (yychar == YYEOF)
-	     for (;;)
-	       {
-		 YYPOPSTACK;
-		 if (yyssp == yyss)
-		   YYABORT;
-		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-		 yydestruct (yystos[*yyssp], yyvsp);
-	       }
+	  /* Pop the error token.  */
+          YYPOPSTACK;
+	  /* Pop the rest of the stack.  */
+	  while (yyss < yyssp)
+	    {
+	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+	      yydestruct (yystos[*yyssp], yyvsp);
+	      YYPOPSTACK;
+	    }
+	  YYABORT;
         }
-      else
-	{
-	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-	  yydestruct (yytoken, &yylval);
-	  yychar = YYEMPTY;
 
-	}
+      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+      yydestruct (yytoken, &yylval);
+      yychar = YYEMPTY;
+
     }
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
-  goto yyerrlab1;
+  goto yyerrlab2;
 
 
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
+/*----------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action.  |
+`----------------------------------------------------*/
+yyerrlab1:
 
-#ifdef __GNUC__
-  /* Pacify GCC when the user code never invokes YYERROR and the label
-     yyerrorlab therefore never appears in user code.  */
-  if (0)
-     goto yyerrorlab;
+  /* Suppress GCC warning that yyerrlab1 is unused when no action
+     invokes YYERROR.  */
+#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \
+    && !defined __cplusplus
+  __attribute__ ((__unused__))
 #endif
 
-  yyvsp -= yylen;
-  yyssp -= yylen;
-  yystate = *yyssp;
-  goto yyerrlab1;
 
+  goto yyerrlab2;
 
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
+
+/*---------------------------------------------------------------.
+| yyerrlab2 -- pop states until the error token can be shifted.  |
+`---------------------------------------------------------------*/
+yyerrlab2:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1931,8 +1906,9 @@ yyerrlab1:
 
       YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
       yydestruct (yystos[yystate], yyvsp);
-      YYPOPSTACK;
-      yystate = *yyssp;
+      yyvsp--;
+      yystate = *--yyssp;
+
       YY_STACK_PRINT (yyss, yyssp);
     }
 
diff --git a/src/testpattern/testpatterny.h b/src/testpattern/testpatterny.h
index 989d144..2567b82 100644
--- a/src/testpattern/testpatterny.h
+++ b/src/testpattern/testpatterny.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made by GNU Bison 1.875.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/test/Makefile.in b/test/Makefile.in
index 7ffe70a..c4fc14e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -299,7 +299,6 @@ 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@
-- 
cgit v1.2.3